From 1a36448f951098bd36ed5264cd6de6afcb3ce0f7 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Thu, 27 Sep 2007 07:11:32 +0000 Subject: 2007-09-27 Zhaolei From Cai Fei * rpc.stp (sunrpc.clnt.call_sync, sunrpc.clnt.call_async): Fix the output format of flags in argstr from hex to decimal just to make it same as other probes. --- tapset/rpc.stp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tapset/rpc.stp') diff --git a/tapset/rpc.stp b/tapset/rpc.stp index 480c67c3..6daa7f63 100644 --- a/tapset/rpc.stp +++ b/tapset/rpc.stp @@ -299,7 +299,7 @@ probe sunrpc.clnt.call_sync = kernel.function("rpc_call_sync") ?, flags = $flags name = "sunrpc.clnt.call_sync" - argstr = sprintf("%s %d %s %d %s 0x%x", servername, xid, progname, + argstr = sprintf("%s %d %s %d %s %d", servername, xid, progname, vers, procname, flags) } @@ -345,7 +345,7 @@ probe sunrpc.clnt.call_async = kernel.function("rpc_call_async") ?, flags = $flags name = "sunrpc.clnt.call_async" - argstr = sprintf("%s %d %s %d %s 0x%x", servername, xid, progname, + argstr = sprintf("%s %d %s %d %s %d", servername, xid, progname, vers, procname, flags) } -- cgit From a4cf1b4431dc0402f1e6daf0708a34f31edbee57 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Thu, 27 Sep 2007 07:24:47 +0000 Subject: 2007-09-27 Zhaolei From Cai Fei * rpc.stp (sunrpc.clnt.shutdown_client): Add argument progname's definition for probe sunrpc.clnt.shutdown_client, because it is in the man page but not defined in tapset. --- tapset/rpc.stp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tapset/rpc.stp') diff --git a/tapset/rpc.stp b/tapset/rpc.stp index 6daa7f63..a5740a21 100644 --- a/tapset/rpc.stp +++ b/tapset/rpc.stp @@ -192,6 +192,7 @@ probe sunrpc.clnt.shutdown_client = kernel.function("rpc_shutdown_client") ?, module("sunrpc").function("rpc_shutdown_client") ? { servername = kernel_string($clnt->cl_server) + progname = kernel_string($clnt->cl_protname) prog = prog_from_clnt($clnt) vers = vers_from_clnt($clnt) prot = prot_from_clnt($clnt) @@ -214,8 +215,8 @@ probe sunrpc.clnt.shutdown_client = kernel.function("rpc_shutdown_client") ?, om_execute = $clnt->cl_metrics->om_execute name = "sunrpc.clnt.shutdown_client" - argstr = sprintf("%s %s %d %d %d %d %d %d", servername, progname, - vers, prot, port, authflavor, clones, tasks) + argstr = sprintf("%s %s %d %d %d %d %d %d %d", servername, progname, + prog, vers, prot, port, authflavor, clones, tasks) } probe sunrpc.clnt.shutdown_client.return = -- cgit From 5e4c160908b88e1272ec09f2c88d7612ce82b7c8 Mon Sep 17 00:00:00 2001 From: wenji Date: Thu, 27 Sep 2007 09:11:34 +0000 Subject: 2007-09-27 Wenji Huang * rpc.stp (clones_from_clnt, tasks_from_clnt): Fix for kernel >= 2.6.22. * nfs.stp (__nfsi_ndirty) : Ditto. * nfs_proc.stp (__nfsv4_bitmask) : Make bitmask valid according to CONFIG. --- tapset/rpc.stp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tapset/rpc.stp') diff --git a/tapset/rpc.stp b/tapset/rpc.stp index a5740a21..3d17d221 100644 --- a/tapset/rpc.stp +++ b/tapset/rpc.stp @@ -947,13 +947,21 @@ function port_from_clnt:long(clnt:long) function clones_from_clnt:long(clnt:long) %{ /* pure */ struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22) THIS->__retvalue = atomic_read(&clnt->cl_count); /* FIXME: deref hazard! */ +#else + THIS->__retvalue = -1; +#endif %} function tasks_from_clnt:long(clnt:long) %{ /* pure */ struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22) THIS->__retvalue = atomic_read(&clnt->cl_users); /* FIXME: deref hazard! */ +#else + THIS->__retvalue = -1; +#endif %} function proc_from_msg:long(msg:long) -- cgit