diff options
author | srinivasa <srinivasa> | 2008-02-25 13:28:16 +0000 |
---|---|---|
committer | srinivasa <srinivasa> | 2008-02-25 13:28:16 +0000 |
commit | bcff621c3435d720092f8586726917e8eed030d1 (patch) | |
tree | 161e637ccdaa822a5448b29c62c8f217aaf6d6f2 /tapset/syscalls2.stp | |
parent | 8a0dc35ee2dc6164e30e0a4c664768066db047e0 (diff) | |
download | systemtap-steved-bcff621c3435d720092f8586726917e8eed030d1.tar.gz systemtap-steved-bcff621c3435d720092f8586726917e8eed030d1.tar.xz systemtap-steved-bcff621c3435d720092f8586726917e8eed030d1.zip |
Fix for bug#5772
Diffstat (limited to 'tapset/syscalls2.stp')
-rw-r--r-- | tapset/syscalls2.stp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index e49a9224..80c88707 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -3023,13 +3023,20 @@ probe syscall.compat_vmsplice.return = kernel.function("compat_sys_vmsplice").re # probe syscall.wait4 = kernel.function("sys_wait4") { name = "wait4" - pid = $pid +%( kernel_vr > "2.6.24" %? + pid = $upid +%: + pid = $pid +%) status_uaddr = $stat_addr options = $options options_str = _wait4_opt_str($options) rusage_uaddr = $ru +%( kernel_vr > "2.6.24" %? + argstr = sprintf("%d, %p, %s, %p", $upid, $stat_addr, _wait4_opt_str($options), $ru) +%: argstr = sprintf("%d, %p, %s, %p", $pid, $stat_addr, _wait4_opt_str($options), $ru) - +%) } probe syscall.wait4.return = kernel.function("sys_wait4").return { name = "wait4" @@ -3047,13 +3054,22 @@ probe syscall.waitid = kernel.function("sys_waitid") { name = "waitid" which = $which which_str = _waitid_which_str($which) - pid = $pid +%( kernel_vr > "2.6.24" %? + pid = $upid +%: + pid = $pid +%) infop_uaddr = $infop options = $options options_str = _waitid_opt_str($options) rusage_uaddr = $ru +%( kernel_vr > "2.6.24" %? + argstr = sprintf("%d, %d, %p, %s, %p", $which, $upid, + $infop, _waitid_opt_str($options), $ru) +%: argstr = sprintf("%d, %d, %p, %s, %p", $which, $pid, $infop, _waitid_opt_str($options), $ru) +%) } probe syscall.waitid.return = kernel.function("sys_waitid").return { name = "waitid" |