diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-26 10:33:13 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-26 10:33:13 -0500 |
| commit | 781c25855e35a7b77e5794bd027ca0cf41e4a3a4 (patch) | |
| tree | 9a65bbdba0d5259847b4e2c955d947b928026e29 /tapset | |
| parent | 12b90fcf910f540cb28de154edd0bdcd109b1c76 (diff) | |
| parent | 5e5e17baf86f6abc030513765da189b6974be84e (diff) | |
| download | systemtap-steved-781c25855e35a7b77e5794bd027ca0cf41e4a3a4.tar.gz systemtap-steved-781c25855e35a7b77e5794bd027ca0cf41e4a3a4.tar.xz systemtap-steved-781c25855e35a7b77e5794bd027ca0cf41e4a3a4.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/syscalls2.stp | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 80c88707..b0118423 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -3023,20 +3023,14 @@ probe syscall.compat_vmsplice.return = kernel.function("compat_sys_vmsplice").re # probe syscall.wait4 = kernel.function("sys_wait4") { name = "wait4" -%( kernel_vr > "2.6.24" %? - pid = $upid -%: - pid = $pid -%) + pid = %( kernel_vr > "2.6.24"%? $upid %: $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) -%) + argstr = sprintf("%d, %p, %s, %p", + %( kernel_vr > "2.6.24"%? $upid %: $pid%), + $stat_addr,_wait4_opt_str($options), $ru) } probe syscall.wait4.return = kernel.function("sys_wait4").return { name = "wait4" @@ -3052,24 +3046,16 @@ probe syscall.wait4.return = kernel.function("sys_wait4").return { # probe syscall.waitid = kernel.function("sys_waitid") { name = "waitid" + pid = %( kernel_vr > "2.6.24"%? $upid %: $pid%) which = $which which_str = _waitid_which_str($which) -%( 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) -%) + argstr = sprintf("%d, %d, %p, %s, %p", $which, + %( kernel_vr > "2.6.24"%? $upid %: $pid%), $infop, + _waitid_opt_str($options), $ru) } probe syscall.waitid.return = kernel.function("sys_waitid").return { name = "waitid" |