PR20333/epoll_create

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 5ae19ee9a96a2e60db840ea19b83f9aba29d855a..1d199f81132b17c6bbefbd7647610ce0d9bb9a3c 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,49 +1,4 @@
 
-# epoll_create _______________________________________________
-# long sys_epoll_create(int size)
-# SYSCALL_DEFINE1(epoll_create1, int, flags)
-probe nd_syscall.epoll_create = __nd_syscall.epoll_create1 !,
-                                __nd_syscall.epoll_create ?
-{
-}
-probe __nd_syscall.epoll_create1 = kprobe.function("sys_epoll_create1")
-{
-       asmlinkage()
-       size = 0;
-       flags = int_arg(1)
-       if (flags == 0) {
-               name = "epoll_create";
-               argstr = sprint(size);
-       } else {
-               name = "epoll_create1";
-               argstr = _epoll_create1_flag_str(flags);
-       }
-}
-probe __nd_syscall.epoll_create = kprobe.function("sys_epoll_create")
-{
-       name = "epoll_create"
-       asmlinkage()
-       size = int_arg(1)
-       flags = 0
-       argstr = sprint(size)
-}
-probe nd_syscall.epoll_create.return = __nd_syscall.epoll_create1.return !,
-                                       __nd_syscall.epoll_create.return ?
-{
-}
-probe __nd_syscall.epoll_create1.return = kprobe.function("sys_epoll_create1").return
-{
-       flags = @entry(__asmlinkage_int_arg(1))
-       name = (flags == 0) ? "epoll_create" : "epoll_create1";
-       retstr = returnstr(1)
-}
-probe __nd_syscall.epoll_create.return = kprobe.function("sys_epoll_create").return
-{
-       flags = 0
-       name = "epoll_create"
-       retstr = returnstr(1)
-}
-
 # epoll_ctl __________________________________________________
 #
 # long sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)

diff --git a/tapset/linux/sysc_epoll_create.stp b/tapset/linux/sysc_epoll_create.stp
new file mode 100644 (file)
index 0000000..e9a240c
--- /dev/null
+++ b/tapset/linux/sysc_epoll_create.stp
@@ -0,0 +1,73 @@
+# epoll_create _______________________________________________
+# long sys_epoll_create(int size)
+# SYSCALL_DEFINE1(epoll_create1, int, flags)
+
+probe syscall.epoll_create = dw_syscall.epoll_create !, nd_syscall.epoll_create {}
+probe syscall.epoll_create.return = dw_syscall.epoll_create.return !, nd_syscall.epoll_create.return {}
+
+# dw_epoll_create _____________________________________________________
+
+probe dw_syscall.epoll_create = kernel.function("sys_epoll_create1").call !,
+                             kernel.function("sys_epoll_create").call ?
+{
+       size = @choose_defined($size, 0);
+       flags = __int32(@choose_defined($flags, 0));
+       if (flags == 0) {
+               name = "epoll_create";
+               argstr = sprint(size);
+       } else {
+               name = "epoll_create1";
+               argstr = _epoll_create1_flag_str(flags);
+       }
+}
+probe dw_syscall.epoll_create.return = kernel.function("sys_epoll_create1").return !,
+                                    kernel.function("sys_epoll_create").return ?
+{
+       flags = __int32(@entry(@choose_defined($flags, 0)));
+       name = (flags == 0) ? "epoll_create" : "epoll_create1";
+       retstr = return_str(1, $return)
+}
+
+# nd_epoll_create _____________________________________________________
+
+probe nd_syscall.epoll_create = __nd_syscall.epoll_create1 !,
+                                __nd_syscall.epoll_create ?
+{
+}
+probe __nd_syscall.epoll_create1 = kprobe.function("sys_epoll_create1")
+{
+       asmlinkage()
+       size = 0;
+       flags = int_arg(1)
+       if (flags == 0) {
+               name = "epoll_create";
+               argstr = sprint(size);
+       } else {
+               name = "epoll_create1";
+               argstr = _epoll_create1_flag_str(flags);
+       }
+}
+probe __nd_syscall.epoll_create = kprobe.function("sys_epoll_create")
+{
+       name = "epoll_create"
+       asmlinkage()
+       size = int_arg(1)
+       flags = 0
+       argstr = sprint(size)
+}
+probe nd_syscall.epoll_create.return = __nd_syscall.epoll_create1.return !,
+                                       __nd_syscall.epoll_create.return ?
+{
+}
+probe __nd_syscall.epoll_create1.return = kprobe.function("sys_epoll_create1").return
+{
+       flags = @entry(__asmlinkage_int_arg(1))
+       name = (flags == 0) ? "epoll_create" : "epoll_create1";
+       retstr = returnstr(1)
+}
+probe __nd_syscall.epoll_create.return = kprobe.function("sys_epoll_create").return
+{
+       flags = 0
+       name = "epoll_create"
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 8cddad9c1a23fc73d2e030c8ba40334ac1b7b02b..bd1419bbfcb994f939c96fa913b8273567e5ad5b 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,28 +1,4 @@
 
-# epoll_create _______________________________________________
-# long sys_epoll_create(int size)
-# SYSCALL_DEFINE1(epoll_create1, int, flags)
-probe syscall.epoll_create = kernel.function("sys_epoll_create1").call !,
-                             kernel.function("sys_epoll_create").call ?
-{
-       size = @choose_defined($size, 0);
-       flags = __int32(@choose_defined($flags, 0));
-       if (flags == 0) {
-               name = "epoll_create";
-               argstr = sprint(size);
-       } else {
-               name = "epoll_create1";
-               argstr = _epoll_create1_flag_str(flags);
-       }
-}
-probe syscall.epoll_create.return = kernel.function("sys_epoll_create1").return !,
-                                    kernel.function("sys_epoll_create").return ?
-{
-       flags = __int32(@entry(@choose_defined($flags, 0)));
-       name = (flags == 0) ? "epoll_create" : "epoll_create1";
-       retstr = return_str(1, $return)
-}
-
 # epoll_ctl __________________________________________________
 #
 # long sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)