summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tapset/ChangeLog7
-rw-r--r--tapset/syscalls.stp59
-rw-r--r--tapset/syscalls2.stp22
3 files changed, 45 insertions, 43 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 62ccec07..dfc586f1 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,5 +1,12 @@
2006-05-25 Martin Hunt <hunt@redhat.com>
+ * syscalls.stp: Add sys_fcntl and sys_listen.
+
+ * syscalls2.stp: Commented out sys_socketcall because it only calls
+ other system calls which are already probed.
+
+2006-05-25 Martin Hunt <hunt@redhat.com>
+
* syscall*.stp: Change "0x%p" to "%p".
2006-05-25 Li Guanglei <guanglei@cn.ibm.com>
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 8a481c87..9db73182 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -550,24 +550,19 @@ probe syscall.fchown16.return = kernel.function("sys_fchown").return {
}
# fcntl ______________________________________________________
-/*
- * asmlinkage long
- * sys_fcntl(int fd,
- * unsigned int cmd,
- * unsigned long arg)
- */
-probe kernel.syscall.fcntl =
- kernel.function("sys_fcntl") {
- name = "fcntl"
- fd = $fd
- cmd = $cmd
- cmd_str = _fcntl_cmd_str($cmd)
- arg = $arg
- }
-probe kernel.syscall.fcntl.return =
- kernel.function("sys_fcntl").return {
- name = "fcntl.return"
- }
+# long sys_fcntl(int fd, unsigned int cmd, unsigned long arg)
+probe syscall.fcntl = kernel.function("sys_fcntl") {
+ name = "fcntl"
+ fd = $fd
+ cmd = $cmd
+ cmd_str = _fcntl_cmd_str($cmd)
+ arg = $arg
+ argstr = sprintf("%d, %s, %p", $fd, cmd_str, $arg)
+}
+probe syscall.fcntl.return = kernel.function("sys_fcntl").return {
+ name = "fcntl"
+ retstr = returnstr(1)
+}
# fdatasync __________________________________________________
# long sys_fdatasync(unsigned int fd)
@@ -1427,22 +1422,20 @@ probe kernel.syscall.link.return =
kernel.function("sys_link").return {
name = "link.return"
}
+
# listen _____________________________________________________
-/*
- * asmlinkage long
- * sys_listen(int fd,
- * int backlog)
- */
-probe kernel.syscall.listen =
- kernel.function("sys_listen") {
- name = "listen"
- s = $fd
- backlog = $backlog
- }
-probe kernel.syscall.listen.return =
- kernel.function("sys_listen").return {
- name = "listen.return"
- }
+# long sys_listen(int fd, int backlog)
+probe syscall.listen = kernel.function("sys_listen") {
+ name = "listen"
+ sockfd = $fd
+ backlog = $backlog
+ argstr = sprintf("%d, %d", $fd, $backlog)
+}
+probe syscall.listen.return = kernel.function("sys_listen").return {
+ name = "listen"
+ retstr = returnstr(1)
+}
+
# listxattr __________________________________________________
/*
* asmlinkage ssize_t
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index ad5383cd..2355a3c7 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -1790,22 +1790,24 @@ probe syscall.socket.return = kernel.function("sys_socket").return {
name = "socket"
retstr = returnstr(1)
}
+
+# commented out because this seems redundant
# socketcall _________________________________________________
#
# asmlinkage long
# sys_socketcall(int call,
# unsigned long __user *args)
#
-probe syscall.socketcall = kernel.function("sys_socketcall") {
- name = "socketcall"
- call = $call
- args_uaddr = $args
- argstr = sprintf("%d, [%p]", $call, args_uaddr)
-}
-probe syscall.socketcall.return = kernel.function("sys_socketcall").return {
- name = "socketcall"
- retstr = returnstr(1)
-}
+#probe syscall.socketcall = kernel.function("sys_socketcall") {
+# name = "socketcall"
+# call = $call
+# args_uaddr = $args
+# argstr = sprintf("%d, [%p]", $call, args_uaddr)
+#}
+#probe syscall.socketcall.return = kernel.function("sys_socketcall").return {
+# name = "socketcall"
+# retstr = returnstr(1)
+#}
# socketpair _________________________________________________
#
# asmlinkage long