From 0aa5d3ed4dd5b38f302b0175a3e279bdb6d3a7ad Mon Sep 17 00:00:00 2001 From: wcohen Date: Thu, 9 Aug 2007 14:11:43 +0000 Subject: [PATCH] 2007-08-09 William Cohen * tapset/syscalls.stp (syscall.compat_execve, syscall.compat_execve.return): * tapset/syscalls2.stp (syscall.compat_sys_semtimedop, syscall.compat_sys_semtimedop.return): * tapset/i686/syscalls.stp (syscall.set_zone_reclaim, syscall.set_zone_reclaim.return): Make optional. --- tapset/ChangeLog | 9 +++++++++ tapset/i686/syscalls.stp | 6 ++---- tapset/syscalls.stp | 4 ++-- tapset/syscalls2.stp | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index c65cf3a8f..dbb759246 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,12 @@ +2007-08-09 William Cohen + + * tapset/syscalls.stp (syscall.compat_execve, + syscall.compat_execve.return): + * tapset/syscalls2.stp (syscall.compat_sys_semtimedop, + syscall.compat_sys_semtimedop.return): + * tapset/i686/syscalls.stp (syscall.set_zone_reclaim, + syscall.set_zone_reclaim.return): Make optional. + 2007-08-08 Frank Ch. Eigler From "Zhaolei" zhaolei@cn.fujitsu.com: diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp index 1106ea3d8..ff5473da1 100644 --- a/tapset/i686/syscalls.stp +++ b/tapset/i686/syscalls.stp @@ -98,9 +98,8 @@ probe syscall.set_thread_area.return = * unsigned int zone, * unsigned int state) */ -%( kernel_v < "2.6.15" %? probe syscall.set_zone_reclaim = - kernel.function("sys_set_zone_reclaim") { + kernel.function("sys_set_zone_reclaim") ? { name = "set_zone_reclaim" node = $node zone = $zone @@ -108,11 +107,10 @@ probe syscall.set_zone_reclaim = argstr = sprintf("%d, %d, %d", $node, $zone, $state) } probe syscall.set_zone_reclaim.return = - kernel.function("sys_set_zone_reclaim").return { + kernel.function("sys_set_zone_reclaim").return ? { name = "set_zone_reclaim" retstr = returnstr(1) } -%) # sigaltstack ________________________________________________ # int sys_sigaltstack(unsigned long ebx) diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 214a4852e..7299956f0 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -546,13 +546,13 @@ probe syscall.execve.return = kernel.function("do_execve").return { # compat_uptr_t __user *argv, # compat_uptr_t __user *envp, # struct pt_regs * regs) -probe syscall.compat_execve = kernel.function("compat_do_execve") { +probe syscall.compat_execve = kernel.function("compat_do_execve") ? { name = "compat_execve" filename = kernel_string($filename) args = __get_compat_argv($argv) argstr = sprintf("%s %s", filename, args) } -probe syscall.compat_execve.return = kernel.function("compat_do_execve").return { +probe syscall.compat_execve.return = kernel.function("compat_do_execve").return ? { name = "compat_execve" retstr = returnstr(1) } diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index d208b45c8..6c14dc96e 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -1331,7 +1331,7 @@ probe syscall.semtimedop.return = kernel.function("sys_semtimedop").return ? { # long compat_sys_semtimedop(int semid, struct sembuf __user *tsems, # unsigned nsops, const struct compat_timespec __user *timeout) # -probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") { +probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") ? { name = "compat_sys_semtimedop" semid = $semid sops_uaddr = tsems @@ -1340,7 +1340,7 @@ probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") { argstr = sprintf("%d, %p, %d, %s", $semid, $tsems, $nsops, _struct_compat_timespec_u($timeout)) } -probe syscall.compat_sys_semtimedop.return = kernel.function("compat_sys_semtimedop").return { +probe syscall.compat_sys_semtimedop.return = kernel.function("compat_sys_semtimedop").return ? { name = "compat_sys_semtimedop" retstr = returnstr(1) } -- 2.43.5