From fc5a2d42b6cc46a9d4f7f3919ddc74ce70ad2a66 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 20 May 2008 21:58:04 +0200 Subject: PR5001: Remove _stp_ctime and always use ctime. --- tapset/syscalls2.stp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tapset/syscalls2.stp') diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 558e89bb..31e1830d 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -2900,8 +2900,10 @@ probe syscall.utime = kernel.function("sys_utime") ? { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $times - buf_str = _struct_utimbuf_u($times) - argstr = sprintf("%s, %s", user_string_quoted($filename), buf_str) + actime = _struct_utimbuf_actime(buf_uaddr) + modtime = _struct_utimbuf_modtime(buf_uaddr) + argstr = sprintf("%s, [%s, %s]", user_string_quoted($filename), + ctime(actime), ctime(modtime)) } probe syscall.utime.return = kernel.function("sys_utime").return ? { name = "utime" @@ -2914,8 +2916,10 @@ probe syscall.compat_utime = kernel.function("compat_sys_utime") ? { filename_uaddr = $filename filename = user_string($filename) buf_uaddr = $t - buf_str = _struct_compat_utimbuf_u($t) - argstr = sprintf("%s, %s", user_string_quoted($filename), _struct_compat_utimbuf_u($t)) + actime = _struct_compat_utimbuf_actime(buf_uaddr) + modtime = _struct_compat_utimbuf_modtime(buf_uaddr) + argstr = sprintf("%s, [%s, %s]", user_string_quoted($filename), + ctime(actime), ctime(modtime)) } probe syscall.compat_utime.return = kernel.function("compat_sys_utime").return ? { name = "utime" -- cgit From cf96be783e89607e1b8b755bbd08ba41b564c4fc Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 20 May 2008 18:33:38 -0400 Subject: PR6538: tapset changes --- tapset/syscalls2.stp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tapset/syscalls2.stp') diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 31e1830d..344396f4 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -1364,7 +1364,7 @@ probe syscall.semtimedop.return = kernel.function("sys_semtimedop").return ? { probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") ? { name = "compat_sys_semtimedop" semid = $semid - sops_uaddr = tsems + sops_uaddr = $tsems nsops = $nsops timeout_uaddr = $timeout argstr = sprintf("%d, %p, %d, %s", $semid, $tsems, $nsops, -- cgit From e483d9dfa614ee17b488df7224ee22a0f7dc9386 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 21 May 2008 16:12:17 +0200 Subject: Use pointer_arg to fetch arguments for syscall.utime and compat_utime. --- tapset/syscalls2.stp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tapset/syscalls2.stp') diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 31e1830d..81d5f973 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -2897,12 +2897,12 @@ probe syscall.ustat.return = # long sys_utime(char __user * filename, struct utimbuf __user * times) probe syscall.utime = kernel.function("sys_utime") ? { name = "utime" - filename_uaddr = $filename - filename = user_string($filename) - buf_uaddr = $times + filename_uaddr = pointer_arg(1) + filename = user_string_quoted(filename_uaddr) + buf_uaddr = pointer_arg(2) actime = _struct_utimbuf_actime(buf_uaddr) modtime = _struct_utimbuf_modtime(buf_uaddr) - argstr = sprintf("%s, [%s, %s]", user_string_quoted($filename), + argstr = sprintf("%s, [%s, %s]", filename, ctime(actime), ctime(modtime)) } probe syscall.utime.return = kernel.function("sys_utime").return ? { @@ -2913,12 +2913,12 @@ probe syscall.utime.return = kernel.function("sys_utime").return ? { # long compat_sys_utime(char __user *filename, struct compat_utimbuf __user *t) probe syscall.compat_utime = kernel.function("compat_sys_utime") ? { name = "utime" - filename_uaddr = $filename - filename = user_string($filename) - buf_uaddr = $t + filename_uaddr = pointer_arg(1) + filename = user_string_quoted(filename_uaddr) + buf_uaddr = pointer_arg(2) actime = _struct_compat_utimbuf_actime(buf_uaddr) modtime = _struct_compat_utimbuf_modtime(buf_uaddr) - argstr = sprintf("%s, [%s, %s]", user_string_quoted($filename), + argstr = sprintf("%s, [%s, %s]", filename, ctime(actime), ctime(modtime)) } probe syscall.compat_utime.return = kernel.function("compat_sys_utime").return ? { -- cgit