summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--tapset/syscalls.stp8
-rw-r--r--tapsets.cxx5
3 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c077983..6e2d5149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-05 Eugene Teo <eteo@redhat.com>
+
+ PR 2433
+ * tapsets.cxx (dwarf_query::blacklisted_p): Extend the list of
+ blacklisted .return probes to include "do_exit". Correct funcname
+ typo for "sys_groupexit".
+ * tapset/syscalls.stp: Remove .return probe aliases of never-
+ returning syscall.exit and syscall.exit_group calls.
+
2006-05-05 David Smith <dsmith@redhat.com>
* translate.cxx (mapvar::exists): Added code for string array
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 36903b57..7c1cb926 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -440,10 +440,6 @@ probe syscall.exit = kernel.function("do_exit") {
status = $code
argstr = string($code)
}
-probe syscall.exit.return = kernel.function("do_exit").return {
- name = "exit"
- retstr = returnstr(1)
-}
# exit_group _________________________________________________
/*
@@ -455,10 +451,6 @@ probe kernel.syscall.exit_group =
name = "exit_group"
status = $error_code
}
-probe kernel.syscall.exit_group.return =
- kernel.function("do_group_exit").return {
- name = "exit_group.return"
- }
# fadvise64 __________________________________________________
/*
* asmlinkage long
diff --git a/tapsets.cxx b/tapsets.cxx
index c23b8233..2fab6583 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1981,8 +1981,9 @@ dwarf_query::blacklisted_p(string const & funcname,
(funcname == "__switch_to" && sess.architecture == "x86_64") ||
filename_s == "kernel/kprobes.c" ||
0 == fnmatch ("arch/*/kernel/kprobes.c", filename, 0) ||
- (has_return && (funcname == "sys_exit" ||
- funcname == "sys_groupexit")))
+ (has_return && (funcname == "do_exit" ||
+ funcname == "sys_exit" ||
+ funcname == "sys_exit_group")))
{
if (sess.verbose>1)
clog << "skipping function '" << funcname << "' file '"