diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-25 09:52:53 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-25 09:52:53 -0500 |
| commit | 12b90fcf910f540cb28de154edd0bdcd109b1c76 (patch) | |
| tree | 161e637ccdaa822a5448b29c62c8f217aaf6d6f2 | |
| parent | b781aecce66c4c99bed488d40cabd1022ea3edc3 (diff) | |
| parent | bcff621c3435d720092f8586726917e8eed030d1 (diff) | |
| download | systemtap-steved-12b90fcf910f540cb28de154edd0bdcd109b1c76.tar.gz systemtap-steved-12b90fcf910f540cb28de154edd0bdcd109b1c76.tar.xz systemtap-steved-12b90fcf910f540cb28de154edd0bdcd109b1c76.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
| -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" |