diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-09-16 12:18:50 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-09-16 12:18:50 -0400 |
| commit | 0f4a9cb5967714ace01e0941592040b8c1d83ee7 (patch) | |
| tree | f97784dbd9392694931c1be99abf7920f6f0484b /tapset | |
| parent | d83d7b513d38791751e46a05e382b1e6876abefc (diff) | |
| parent | d833f810e4ffaf5c9c16eebc7f10b9d14e53e508 (diff) | |
| download | systemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.tar.gz systemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.tar.xz systemtap-steved-0f4a9cb5967714ace01e0941592040b8c1d83ee7.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/nd_syscalls2.stp | 15 | ||||
| -rw-r--r-- | tapset/scheduler.stp | 6 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 12 |
3 files changed, 28 insertions, 5 deletions
diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp index 6e50d256..8b604f94 100644 --- a/tapset/nd_syscalls2.stp +++ b/tapset/nd_syscalls2.stp @@ -4134,10 +4134,23 @@ probe nd_syscall.ustat32 = kprobe.function("sys32_ustat") ? dev = uint_arg(1) argstr = sprintf("%d, %p", dev, pointer_arg(2)) } +# Since 2.6.30 sys32_ustat is called compat_sys_ustat and is now asmlinkage. +#asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u) +probe nd_syscall.ustat32 = kprobe.function("compat_sys_ustat") ? +{ + name = "ustat" + // dev = $dev + // argstr = sprintf("%d, %p", $dev, $u) + // asmlinkage + asmlinkage() + dev = uint_arg(1) + argstr = sprintf("%d, %p", dev, pointer_arg(2)) +} probe nd_syscall.ustat.return = kprobe.function("SyS_ustat").return ?, kprobe.function("sys_ustat").return ?, - kprobe.function("sys32_ustat").return ? + kprobe.function("sys32_ustat").return ?, + kprobe.function("compat_sys_ustat").return ? { name = "ustat" retstr = returnstr(1) diff --git a/tapset/scheduler.stp b/tapset/scheduler.stp index d67e0310..3c3d504e 100644 --- a/tapset/scheduler.stp +++ b/tapset/scheduler.stp @@ -33,7 +33,7 @@ function __is_idle:long() * idle - boolean indicating whether current is the idle process */ probe scheduler.cpu_off - = kernel.function("context_switch") + = kernel.trace("sched_switch") !, kernel.function("context_switch") { task_prev = $prev task_next = $next @@ -122,9 +122,9 @@ probe scheduler.balance = kernel.function("idle_balance")? {} */ probe scheduler.ctxswitch = %( arch != "x86_64" && arch != "ia64" %? - kernel.function("__switch_to") + kernel.trace("sched_switch") !, kernel.function("__switch_to") %: - kernel.function("context_switch") + kernel.trace("sched_switch") !, kernel.function("context_switch") %) { %( arch == "powerpc" %? diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index defc50a0..e2be10fc 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -3414,10 +3414,20 @@ probe syscall.ustat32 = kernel.function("sys32_ustat") ? dev = $dev argstr = sprintf("%d, %p", $dev, $u32p) } +# Since 2.6.30 sys32_ustat is compat_sys_ustat +# Note that last argument changed name. +#long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u) +probe syscall.ustat32 = kernel.function("compat_sys_ustat") ? +{ + name = "ustat" + dev = $dev + argstr = sprintf("%d, %p", $dev, $u) +} probe syscall.ustat.return = kernel.function("SyS_ustat").return ?, kernel.function("sys_ustat").return ?, - kernel.function("sys32_ustat").return ? + kernel.function("sys32_ustat").return ?, + kernel.function("compat_sys_ustat").return ? { name = "ustat" retstr = returnstr(1) |