diff options
| -rw-r--r-- | tapset/ChangeLog | 5 | ||||
| -rw-r--r-- | tapset/aux_syscalls.stp | 2 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 22 |
3 files changed, 16 insertions, 13 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 4ee2f63d..b213692f 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2007-09-24 Martin Hunt <hunt@redhat.com> + + * aux_syscalls.stp (_at_flag_str): Add some more flags. + * syscalls2.stp (openat): Call _dfd_str(). + 2007-09-24 David Smith <dsmith@redhat.com> * nfsd.stp (__svc_fh): Added missing semicolon. diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index fe16cac7..4d1e31ed 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -1788,5 +1788,7 @@ function _dfd_str(d) { function _at_flag_str(f) { if (f == 0x100) return "AT_SYMLINK_NOFOLLOW" + if (f == 0x200) return "AT_REMOVEDIR" + if (f == 0x400) return "AT_SYMLINK_FOLLOW" return sprintf("0x%x", f) } diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 1c89ee5e..bdf12f68 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -141,11 +141,11 @@ probe syscall.openat = flags = $flags mode = $mode if ($flags & 64) - argstr = sprintf("%d, %s, %s, %#o", $dfd, + argstr = sprintf("%s, %s, %s, %#o", _dfd_str($dfd), user_string_quoted($filename), _sys_open_flag_str($flags), $mode) else - argstr = sprintf("%d, %s, %s", $dfd, + argstr = sprintf("%s, %s, %s", _dfd_str($dfd), user_string_quoted($filename), _sys_open_flag_str($flags)) } @@ -609,7 +609,7 @@ probe syscall.readlink = kernel.function("sys_readlink") { buf_uaddr = $buf bufsiz = $bufsiz argstr = sprintf("%s, %p, %d", user_string_quoted($path), - buf_uaddr, bufsiz) + $buf, $bufsiz) } probe syscall.readlink.return = kernel.function("sys_readlink").return { name = "readlink" @@ -628,12 +628,8 @@ probe syscall.readlinkat = kernel.function("sys_readlinkat") { path = user_string($path) buf_uaddr = $buf bufsiz = $bufsiz - if (dfd == -100) - argstr = sprintf("AT_FDCWD, %s, %p, %d", user_string_quoted($path), - buf_uaddr, bufsiz) - else - argstr = sprintf("%d, %s, %p, %d", dfd, user_string_quoted($path), - buf_uaddr, bufsiz) + argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($path), + $buf, $bufsiz) } probe syscall.readlinkat.return = kernel.function("sys_readlinkat").return { name = "readlinkat" @@ -674,8 +670,7 @@ probe syscall.readv.return = # reboot _____________________________________________________ # -# asmlinkage long -# sys_reboot(int magic1, +# long sys_reboot(int magic1, # int magic2, # unsigned int cmd, # void __user * arg) @@ -687,15 +682,16 @@ probe syscall.reboot = kernel.function("sys_reboot") { magic2 = $magic2 magic2_str =_reboot_magic_str($magic2) flag = $cmd - flag_str = _reboot_flag_str(flag) + flag_str = _reboot_flag_str($cmd) arg_uaddr = $arg argstr = sprintf("%s, %s, %s, %p", magic_str, magic2_str, - flag_str, arg_uaddr) + flag_str, $arg) } probe syscall.reboot.return = kernel.function("sys_reboot").return { name = "reboot" retstr = returnstr(1) } + # recv _______________________________________________________ # # long sys_recv(int fd, void __user *ubuf, size_t size, unsigned flags) |