diff options
| author | David Smith <dsmith@redhat.com> | 2010-03-05 11:14:46 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-03-05 11:14:46 -0600 |
| commit | ae34ff1086e98f986c2f62b8c4666adf57663f11 (patch) | |
| tree | cd645edc78abb702f326732da97c759c1ba19ec9 /tapset/x86_64 | |
| parent | ad79c8a6970b39e77ee592479a7b80de683833f6 (diff) | |
| download | systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.tar.gz systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.tar.xz systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.zip | |
PR 11338 (partial): Used '@defined()' in syscall tapsets.
* tapset/syscalls.stp: Used '@defined()' to remove kernel version checks.
* tapset/syscalls2.stp: Ditto.
* tapset/x86_64/syscalls.stp: Ditto.
* tapset/nd_syscalls.stp: Updated to match tapset/syscalls.stp.
* tapset/nd_syscalls2.stp: Updated to match tapset/syscalls2.stp.
* tapset/x86_64/nd_syscalls.stp: Updated to match
tapset/x86_64/syscalls.stp.
Diffstat (limited to 'tapset/x86_64')
| -rw-r--r-- | tapset/x86_64/nd_syscalls.stp | 12 | ||||
| -rw-r--r-- | tapset/x86_64/syscalls.stp | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tapset/x86_64/nd_syscalls.stp b/tapset/x86_64/nd_syscalls.stp index 80c092a8..b0b0686c 100644 --- a/tapset/x86_64/nd_syscalls.stp +++ b/tapset/x86_64/nd_syscalls.stp @@ -30,11 +30,7 @@ probe nd_syscall.arch_prctl.return = kprobe.function("sys_arch_prctl").return probe nd_syscall.iopl = kprobe.function("sys_iopl") { name = "iopl" -// %( kernel_vr == "*xen" %? -// level = $new_iopl -// %: -// level = $level -// %) +// level = (@defined($level) ? $level : $new_iopl) asmlinkage() level = int_arg(1) argstr = sprint(level) @@ -177,17 +173,15 @@ probe nd_syscall.vm86_warning.return = kprobe.function("sys32_vm86_warning").ret # # long sys32_pipe(int __user *fd) # -%(kernel_v < "2.6.32" %? -probe nd_syscall.pipe32 = kprobe.function("sys32_pipe") +probe nd_syscall.pipe32 = kprobe.function("sys32_pipe")? { name = "pipe" // argstr = sprintf("%p", $fd) asmlinkage() argstr = sprintf("%p", pointer_arg(1)) } -probe nd_syscall.pipe32.return = kprobe.function("sys32_pipe").return +probe nd_syscall.pipe32.return = kprobe.function("sys32_pipe").return? { name = "pipe" retstr = returnstr(1) } -%) diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp index 28fa2969..bcb9523d 100644 --- a/tapset/x86_64/syscalls.stp +++ b/tapset/x86_64/syscalls.stp @@ -26,11 +26,7 @@ probe syscall.arch_prctl.return = kernel.function("sys_arch_prctl").return probe syscall.iopl = kernel.function("sys_iopl") { name = "iopl" -%( kernel_vr == "*xen" %? - level = $new_iopl -%: - level = $level -%) + level = (@defined($level) ? $level : $new_iopl) argstr = sprint(level) } probe syscall.iopl.return = kernel.function("sys_iopl").return |