PR20333/brk

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 07decca7b116f51cb6c5acc7d0879402c228b2fd..e07a547c4eb325ecf9d46556a31f7a2b96813ef4 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,21 +1,4 @@
 
-# brk ________________________________________________________
-# unsigned long sys_brk(unsigned long brk)
-probe nd_syscall.brk = kprobe.function("ia64_brk") ?,
-                       kprobe.function("sys_brk") ?
-{
-       name = "brk"
-       asmlinkage()
-       brk = ulong_arg(1)
-       argstr = sprintf("%p", brk)
-}
-probe nd_syscall.brk.return = kprobe.function("ia64_brk").return ?,
-                              kprobe.function("sys_brk").return ?
-{
-       name = "brk"
-       retstr = returnstr(1)
-}
-
 # capget _____________________________________________________
 /*
  *  NOTE

diff --git a/tapset/linux/sysc_brk.stp b/tapset/linux/sysc_brk.stp
new file mode 100644 (file)
index 0000000..0e32e4d
--- /dev/null
+++ b/tapset/linux/sysc_brk.stp
@@ -0,0 +1,48 @@
+# brk ________________________________________________________
+# unsigned long sys_brk(unsigned long brk)
+
+@define _SYSCALL_BRK_NAME
+%(
+       name = "brk"
+%)
+
+@define _SYSCALL_BRK_ARGSTR
+%(
+       argstr = sprintf("%p", brk)
+%)
+
+probe syscall.brk = dw_syscall.brk !, nd_syscall.brk {}
+probe syscall.brk.return = dw_syscall.brk.return !, nd_syscall.brk.return {}
+
+# dw_brk _____________________________________________________
+
+probe dw_syscall.brk = kernel.function("ia64_brk").call ?,
+                    kernel.function("sys_brk").call
+{
+       @_SYSCALL_BRK_NAME
+       brk = __ulong($brk)
+       @_SYSCALL_BRK_ARGSTR
+}
+probe dw_syscall.brk.return = kernel.function("ia64_brk").return ?,
+                           kernel.function("sys_brk").return
+{
+       @_SYSCALL_BRK_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_brk _____________________________________________________
+
+probe nd_syscall.brk = kprobe.function("ia64_brk") ?,
+                       kprobe.function("sys_brk") ?
+{
+       @_SYSCALL_BRK_NAME
+       asmlinkage()
+       brk = ulong_arg(1)
+       @_SYSCALL_BRK_ARGSTR
+}
+probe nd_syscall.brk.return = kprobe.function("ia64_brk").return ?,
+                              kprobe.function("sys_brk").return ?
+{
+       @_SYSCALL_BRK_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 007d05e087b36d370529dc6a3d02f5b032365d54..fcbb82c124c904cc33d14140d6d8edd88b1967af 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,20 +1,4 @@
 
-# brk ________________________________________________________
-# unsigned long sys_brk(unsigned long brk)
-probe syscall.brk = kernel.function("ia64_brk").call ?,
-                    kernel.function("sys_brk").call
-{
-       name = "brk"
-       brk = __ulong($brk)
-       argstr = sprintf("%p", brk)
-}
-probe syscall.brk.return = kernel.function("ia64_brk").return ?,
-                           kernel.function("sys_brk").return
-{
-       name = "brk"
-       retstr = return_str(1, $return)
-}
-
 # capget _____________________________________________________
 /*
  *  NOTE