From 3f728ca446a1dd563c3a87829c38b91860d94758 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Wed, 26 Sep 2007 00:57:37 +0000 Subject: 2007-09-26 Zhaolei * syscalls.stp (adjtimex.return): Improve retstr. * aux_syscalls.stp: Add a function(_adjtimex_return_str) for adjtimex.return. --- tapset/ChangeLog | 6 ++++++ tapset/aux_syscalls.stp | 21 +++++++++++++++++++++ tapset/syscalls.stp | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index a1cf0132..8eea09eb 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,9 @@ +2007-09-26 Zhaolei + + * syscalls.stp (adjtimex.return): Improve retstr. + * aux_syscalls.stp: Add a function(_adjtimex_return_str) for + adjtimex.return. + 2007-09-25 Frank Ch. Eigler * socket.stp (sock_flags_num2str): Define SOCK_PASSCRED if needed. diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index 94444d7a..25984d57 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -1798,3 +1798,24 @@ function _at_flag_str(f) { if (f == 0x400) return "AT_SYMLINK_FOLLOW" return sprintf("0x%x", f) } + +function _adjtimex_return_str(ret) { + if (ret == 0) + val = "OK" + else if (ret == 1) + val = "INS" + else if (ret == 2) + val = "DEL" + else if (ret == 3) + val = "OOP" + else if (ret == 4) + val = "WAIT" + else if (ret == 5) + val = "BAD" + + if (val != "") + return sprintf("%d (TIME_%s)", ret, val) + else + return returnstr(1) +} + diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index a66f3ed1..58282552 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -113,7 +113,7 @@ probe syscall.adjtimex = kernel.function("sys_adjtimex") { } probe syscall.adjtimex.return = kernel.function("sys_adjtimex").return { name = "adjtimex" - retstr = returnstr(1) + retstr = _adjtimex_return_str($return) } # long compat_sys_adjtimex(struct compat_timex __user *utp) probe syscall.compat_adjtimex = kernel.function("compat_sys_adjtimex") ? { -- cgit From ee331156e8a24b486104d40062c7666d0ba410b9 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Wed, 26 Sep 2007 02:10:26 +0000 Subject: 2007-09-26 Zhaolei From Lai Jiangshan modify field-access operator from "." to "->" in all files. --- tapset/ChangeLog | 5 ++++ tapset/nfs_proc.stp | 76 ++++++++++++++++++++++++++--------------------------- tapset/signal.stp | 4 +-- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 8eea09eb..46ebb7ad 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2007-09-26 Zhaolei + + From Lai Jiangshan + modify field-access operator from "." to "->" in all files. + 2007-09-26 Zhaolei * syscalls.stp (adjtimex.return): Improve retstr. diff --git a/tapset/nfs_proc.stp b/tapset/nfs_proc.stp index 3ccd016b..f7129801 100644 --- a/tapset/nfs_proc.stp +++ b/tapset/nfs_proc.stp @@ -305,8 +305,8 @@ probe nfs.proc2.read = kernel.function("nfs_proc_read") ?, version =2 flags = $rdata->flags - count = $rdata->args.count - offset = $rdata->args.offset + count = $rdata->args->count + offset = $rdata->args->offset name = "nfs.proc2.read" argstr = sprintf("%d,%d",count,offset) @@ -332,8 +332,8 @@ probe nfs.proc3.read = kernel.function("nfs3_proc_read") ?, version =3 flags = $rdata->flags - count = $rdata->args.count - offset = $rdata->args.offset + count = $rdata->args->count + offset = $rdata->args->offset name = "nfs.proc3.read" argstr = sprintf("%d,%d",count,offset) @@ -358,8 +358,8 @@ probe nfs.proc4.read = kernel.function("nfs4_proc_read") ?, version =4 flags = $rdata->flags - count = $rdata->args.count - offset = $rdata->args.offset + count = $rdata->args->count + offset = $rdata->args->offset name = "nfs.proc4.read" argstr = sprintf("%d,%d",count,offset) @@ -415,8 +415,8 @@ probe nfs.proc2.write = kernel.function("nfs_proc_write")?, version =2 flags = $wdata->flags - count = $wdata->args.count - offset = $wdata->args.offset + count = $wdata->args->count + offset = $wdata->args->offset name = "nfs.proc2.write" argstr = sprintf("%d,%d",count,offset) @@ -448,8 +448,8 @@ probe nfs.proc3.write = kernel.function("nfs3_proc_write")?, version =3 flags = $wdata->flags - count = $wdata->args.count - offset = $wdata->args.offset + count = $wdata->args->count + offset = $wdata->args->offset name = "nfs.proc3.write" argstr = sprintf("%d,%d",count,offset) @@ -483,8 +483,8 @@ probe nfs.proc4.write = kernel.function("nfs4_proc_write")?, version =4 flags = $wdata->flags - count = $wdata->args.count - offset = $wdata->args.offset + count = $wdata->args->count + offset = $wdata->args->offset bitmask0 = __nfsv4_bitmask($wdata->inode,0) bitmask1 = __nfsv4_bitmask($wdata->inode,1) @@ -543,8 +543,8 @@ probe nfs.proc3.commit = kernel.function ("nfs3_proc_commit")?, prot = __nfs_write_data_info($cdata,1) version =3 - count = $cdata->args.count - offset = $cdata->args.offset + count = $cdata->args->count + offset = $cdata->args->offset name = "nfs.proc3.commit" argstr = sprintf("%d,%d",count,offset) @@ -575,8 +575,8 @@ probe nfs.proc4.commit = kernel.function ("nfs4_proc_commit")?, prot = __nfs_write_data_info($cdata,1) version =4 - count = $cdata->args.count - offset = $cdata->args.offset + count = $cdata->args->count + offset = $cdata->args->offset bitmask0 = __nfsv4_bitmask($cdata->inode,0) bitmask1 = __nfsv4_bitmask($cdata->inode,1) @@ -634,8 +634,8 @@ probe nfs.proc2.read_setup = kernel.function("nfs_proc_read_setup") ?, prot = __nfs_read_data_info($data,1) version =2 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset name = "nfs.proc2.read_setup" argstr = sprintf("%d,%d",count,offset) @@ -659,8 +659,8 @@ probe nfs.proc3.read_setup = kernel.function("nfs3_proc_read_setup") ?, version =3 fh = - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset name = "nfs.proc3.read_setup" argstr = sprintf("%d,%d",count,offset) @@ -683,8 +683,8 @@ probe nfs.proc4.read_setup = kernel.function("nfs4_proc_read_setup") ?, prot = __nfs_read_data_info($data,1) version =4 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset //timestamp = $jiffies name = "nfs.proc4.read_setup" @@ -849,8 +849,8 @@ probe nfs.proc2.write_setup = kernel.function("nfs_proc_write_setup") ?, prot = __nfs_write_data_info($data,1) version =2 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset name = "nfs.proc2.write_setup" argstr = sprintf("%d,%d",count,offset) @@ -873,8 +873,8 @@ probe nfs.proc3.write_setup = kernel.function("nfs3_proc_write_setup") ?, prot = __nfs_write_data_info($data,1) version =3 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset how = $how name = "nfs.proc3.write_setup" @@ -897,8 +897,8 @@ probe nfs.proc4.write_setup = kernel.function("nfs4_proc_write_setup") ?, prot = __nfs_write_data_info($data,1) version =4 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset how = $how bitmask0 = __nfsv4_bitmask($data->inode,0) bitmask1 = __nfsv4_bitmask($data->inode,1) @@ -1066,8 +1066,8 @@ probe nfs.proc3.commit_setup = kernel.function("nfs3_proc_commit_setup") ?, prot = __nfs_write_data_info($data,1) version =3 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset name = "nfs.proc3.commit_setup" argstr = sprintf("%d,%d",count,offset) @@ -1089,8 +1089,8 @@ probe nfs.proc4.commit_setup = kernel.function("nfs4_proc_commit_setup") ?, prot = __nfs_write_data_info($data,1) version =4 - count = $data->args.count - offset = $data->args.offset + count = $data->args->count + offset = $data->args->offset bitmask0 = __nfsv4_bitmask($data->inode,0) bitmask1 = __nfsv4_bitmask($data->inode,1) //timestamp = $jiffies @@ -1318,8 +1318,8 @@ probe nfs.proc2.create = kernel.function("nfs_proc_create")?, version =2 fh = __getfh_inode($dir) - filename = kernel_string($dentry->d_name.name) - filelen = $dentry->d_name.len + filename = kernel_string($dentry->d_name->name) + filelen = $dentry->d_name->len mode = $sattr->ia_mode name = "nfs.proc2.create" @@ -1342,8 +1342,8 @@ probe nfs.proc3.create = kernel.function("nfs3_proc_create")?, version =3 fh = __getfh_inode($dir) - filename = kernel_string($dentry->d_name.name) - filelen = $dentry->d_name.len + filename = kernel_string($dentry->d_name->name) + filelen = $dentry->d_name->len flag = $flags mode = $sattr->ia_mode @@ -1367,8 +1367,8 @@ probe nfs.proc4.create = kernel.function("nfs4_proc_create")?, version =4 fh = __getfh_inode($dir) - filename = kernel_string($dentry->d_name.name) - filelen = $dentry->d_name.len + filename = kernel_string($dentry->d_name->name) + filelen = $dentry->d_name->len flag = $flags mode = $sattr->ia_mode diff --git a/tapset/signal.stp b/tapset/signal.stp index 95ead176..1c8152b6 100644 --- a/tapset/signal.stp +++ b/tapset/signal.stp @@ -427,8 +427,8 @@ probe signal.do_action = kernel.function("do_sigaction") oldsigact_addr = $oact if(sigact_addr != 0) { - sa_handler = $act->sa.sa_handler - sa_mask = $act->sa.sa_mask + sa_handler = $act->sa->sa_handler + sa_mask = $act->sa->sa_mask } } -- cgit From c1e88488ce416934346fe4af40dac7644bff34b2 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Wed, 26 Sep 2007 06:49:10 +0000 Subject: 2007-09-26 Zhaolei From Lai Jiangshan * syscall.stp (syscall.brk): Add probe point kernel.function("ia64_brk") * syscall.stp (syscall.mremap): Add probe point kernel.function("ia64_mremap") --- tapset/syscalls.stp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 58282552..67db2d82 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -178,12 +178,18 @@ probe syscall.bind.return = kernel.function("sys_bind").return ? { # brk ________________________________________________________ # unsigned long sys_brk(unsigned long brk) -probe syscall.brk = kernel.function("sys_brk") { +probe syscall.brk = + kernel.function("sys_brk"), + kernel.function("ia64_brk") ? +{ name = "brk" brk = $brk argstr = sprintf("%p", brk) } -probe syscall.brk.return = kernel.function("sys_brk").return { +probe syscall.brk.return = + kernel.function("sys_brk").return, + kernel.function("ia64_brk").return ? +{ name = "brk" retstr = returnstr(1) } @@ -2555,7 +2561,10 @@ probe syscall.mq_unlink.return = kernel.function("sys_mq_unlink").return ? { # unsigned long flags, # unsigned long new_addr) # -probe syscall.mremap = kernel.function("sys_mremap") ? { +probe syscall.mremap = + kernel.function("sys_mremap") ?, + kernel.function("ia64_mremap") ? +{ name = "mremap" old_address = $addr old_size = $old_len @@ -2565,7 +2574,10 @@ probe syscall.mremap = kernel.function("sys_mremap") ? { argstr = sprintf("%p, %d, %d, %s, %p", $addr, $old_len, $new_len, _mremap_flags($flags), $new_addr) } -probe syscall.mremap.return = kernel.function("sys_mremap").return ? { +probe syscall.mremap.return = + kernel.function("sys_mremap").return ?, + kernel.function("ia64_mremap").return ? +{ name = "mremap" retstr = returnstr(2) } -- cgit From 67535ee31664cd0003bfa8cb73578eeb4724c857 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Wed, 26 Sep 2007 06:51:28 +0000 Subject: 2007-09-26 Zhaolei From Lai Jiangshan * syscall.stp (syscall.brk): Add probe point kernel.function("ia64_brk"). * syscall.stp (syscall.mremap): Add probe point kernel.function("ia64_mremap"). --- tapset/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 46ebb7ad..e313629f 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,11 @@ +2007-09-26 Zhaolei + + From Lai Jiangshan + * syscall.stp (syscall.brk): Add probe point + kernel.function("ia64_brk"). + * syscall.stp (syscall.mremap): Add probe point + kernel.function("ia64_mremap"). + 2007-09-26 Zhaolei From Lai Jiangshan -- cgit