diff options
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/ChangeLog | 5 | ||||
| -rw-r--r-- | tapset/rpc.stp | 167 |
2 files changed, 91 insertions, 81 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 4b37471c..cc226a98 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2008-05-23 Frank Ch. Eigler <fche@elastic.org> + + * rpc.stp (*): Convert kernel?,module? -> kernel!,module probe points. + (rpc_create_task): Make conditional on kernel <= 2.6.18. + 2008-05-21 Frank Ch. Eigler <fche@elastic.org> PR 6538 diff --git a/tapset/rpc.stp b/tapset/rpc.stp index 537bf348..f97117b5 100644 --- a/tapset/rpc.stp +++ b/tapset/rpc.stp @@ -1,6 +1,7 @@ // rpc tapset // Copyright (C) 2006 IBM Corp. // Copyright (C) 2007 Bull S.A.S +// Copyright (C) 2008 Red Hat // // This file is part of systemtap, and is free software. You can // redistribute it and/or modify it under the terms of the GNU General @@ -79,8 +80,9 @@ probe sunrpc.clnt.create_client = _sunrpc.clnt.create_client.* prog, vers, prot, port, authflavor) } -probe _sunrpc.clnt.create_client.part1 = kernel.function("rpc_create_client") ?, - module("sunrpc").function("rpc_create_client") ? +%( kernel_v <= "2.6.18" %? +probe _sunrpc.clnt.create_client.part1 = kernel.function("rpc_create_client") !, + module("sunrpc").function("rpc_create_client") { name = "sunrpc.clnt.create_client" %( kernel_v >= "2.6.10" %? @@ -95,9 +97,10 @@ probe _sunrpc.clnt.create_client.part1 = kernel.function("rpc_create_client") ?, authflavor = $flavor %) } +%) -probe _sunrpc.clnt.create_client.part2 = kernel.function("rpc_new_client") ?, - module("sunrpc").function("rpc_new_client") ? +probe _sunrpc.clnt.create_client.part2 = kernel.function("rpc_new_client") !, + module("sunrpc").function("rpc_new_client") { name = "sunrpc.clnt.new_client" progname = kernel_string($program->name) @@ -106,21 +109,23 @@ probe _sunrpc.clnt.create_client.part2 = kernel.function("rpc_new_client") ?, authflavor = $flavor } -probe sunrpc.clnt.create_client.return = _sunrpc.clnt.create_client.return.* +probe sunrpc.clnt.create_client.return = _sunrpc.clnt.create_client.return.* { retstr = returnstr(2) } +%( kernel_v <= "2.6.18" %? probe _sunrpc.clnt.create_client.return.part1 = - kernel.function("rpc_create_client").return ?, - module("sunrpc").function("rpc_create_client").return ? + kernel.function("rpc_create_client").return !, + module("sunrpc").function("rpc_create_client").return { name = "sunrpc.clnt.create_client.return" } +%) probe _sunrpc.clnt.create_client.return.part2 = - kernel.function("rpc_new_client").return ?, - module("sunrpc").function("rpc_new_client").return ? + kernel.function("rpc_new_client").return !, + module("sunrpc").function("rpc_new_client").return { name = "sunrpc.clnt.new_client.return" } @@ -138,8 +143,8 @@ probe _sunrpc.clnt.create_client.return.part2 = * @port: the port number * @authflavor: the authentication flavor */ -probe sunrpc.clnt.clone_client = kernel.function("rpc_clone_client") ?, - module("sunrpc").function("rpc_clone_client") ? +probe sunrpc.clnt.clone_client = kernel.function("rpc_clone_client") !, + module("sunrpc").function("rpc_clone_client") { servername = kernel_string($clnt->cl_server) progname = kernel_string($clnt->cl_protname) @@ -155,8 +160,8 @@ probe sunrpc.clnt.clone_client = kernel.function("rpc_clone_client") ?, } probe sunrpc.clnt.clone_client.return = - kernel.function("rpc_clone_client").return ?, - module("sunrpc").function("rpc_clone_client").return ? + kernel.function("rpc_clone_client").return !, + module("sunrpc").function("rpc_clone_client").return { name = "sunrpc.clnt.clone_client.return" retstr = returnstr(2) @@ -188,8 +193,8 @@ probe sunrpc.clnt.clone_client.return = * @om_rtt: the RPC RTT jiffies * @om_execute: the RPC execution jiffies */ -probe sunrpc.clnt.shutdown_client = kernel.function("rpc_shutdown_client") ?, - module("sunrpc").function("rpc_shutdown_client") ? +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) @@ -220,8 +225,8 @@ probe sunrpc.clnt.shutdown_client = kernel.function("rpc_shutdown_client") ?, } probe sunrpc.clnt.shutdown_client.return = - kernel.function("rpc_shutdown_client").return ?, - module("sunrpc").function("rpc_shutdown_client").return ? + kernel.function("rpc_shutdown_client").return !, + module("sunrpc").function("rpc_shutdown_client").return { name = "sunrpc.clnt.shutdown_client.return" retstr = returnstr(1) @@ -242,8 +247,8 @@ probe sunrpc.clnt.shutdown_client.return = * @vers: the version of new RPC program */ probe sunrpc.clnt.bind_new_program = - kernel.function("rpc_bind_new_program") ?, - module("sunrpc").function("rpc_bind_new_program") ? + kernel.function("rpc_bind_new_program") !, + module("sunrpc").function("rpc_bind_new_program") { servername = kernel_string($old->cl_server) old_progname = kernel_string($old->cl_protname) @@ -259,8 +264,8 @@ probe sunrpc.clnt.bind_new_program = } probe sunrpc.clnt.bind_new_program.return = - kernel.function("rpc_bind_new_program").return ?, - module("sunrpc").function("rpc_bind_new_program").return ? + kernel.function("rpc_bind_new_program").return !, + module("sunrpc").function("rpc_bind_new_program").return { name = "sunrpc.clnt.bind_new_program.return" retstr = returnstr(2) @@ -282,8 +287,8 @@ probe sunrpc.clnt.bind_new_program.return = * @proc: the procedure number in this RPC call * @flags: flags */ -probe sunrpc.clnt.call_sync = kernel.function("rpc_call_sync") ?, - module("sunrpc").function("rpc_call_sync") ? +probe sunrpc.clnt.call_sync = kernel.function("rpc_call_sync") !, + module("sunrpc").function("rpc_call_sync") { servername = kernel_string($clnt->cl_server) progname = kernel_string($clnt->cl_protname) @@ -306,8 +311,8 @@ probe sunrpc.clnt.call_sync = kernel.function("rpc_call_sync") ?, vers, procname, flags) } -probe sunrpc.clnt.call_sync.return = kernel.function("rpc_call_sync").return ?, - module("sunrpc").function("rpc_call_sync").return ? +probe sunrpc.clnt.call_sync.return = kernel.function("rpc_call_sync").return !, + module("sunrpc").function("rpc_call_sync").return { name = "sunrpc.clnt.call_sync.return" retstr = returnstr(1) @@ -329,8 +334,8 @@ probe sunrpc.clnt.call_sync.return = kernel.function("rpc_call_sync").return ?, * @proc: the procedure number in this RPC call * @flags: flags */ -probe sunrpc.clnt.call_async = kernel.function("rpc_call_async") ?, - module("sunrpc").function("rpc_call_async") ? +probe sunrpc.clnt.call_async = kernel.function("rpc_call_async") !, + module("sunrpc").function("rpc_call_async") { servername = kernel_string($clnt->cl_server) progname = kernel_string($clnt->cl_protname) @@ -354,8 +359,8 @@ probe sunrpc.clnt.call_async = kernel.function("rpc_call_async") ?, } probe sunrpc.clnt.call_async.return = - kernel.function("rpc_call_async").return ?, - module("sunrpc").function("rpc_call_async").return ? + kernel.function("rpc_call_async").return !, + module("sunrpc").function("rpc_call_async").return { name = "sunrpc.clnt.call_async.return" retstr = returnstr(1) @@ -374,8 +379,8 @@ probe sunrpc.clnt.call_async.return = * @tk_priority: the task priority * @tk_runstate: the task run status */ -probe sunrpc.clnt.restart_call = kernel.function("rpc_restart_call") ?, - module("sunrpc").function("rpc_restart_call") ? +probe sunrpc.clnt.restart_call = kernel.function("rpc_restart_call") !, + module("sunrpc").function("rpc_restart_call") { servername = kernel_string($task->tk_client->cl_server) prog = prog_from_clnt($task->tk_client) @@ -391,8 +396,8 @@ probe sunrpc.clnt.restart_call = kernel.function("rpc_restart_call") ?, } probe sunrpc.clnt.restart_call.return = - kernel.function("rpc_restart_call").return ?, - module("sunrpc").function("rpc_restart_call").return ? + kernel.function("rpc_restart_call").return !, + module("sunrpc").function("rpc_restart_call").return { name = "sunrpc.clnt.restart_call.return" } @@ -434,8 +439,8 @@ probe sunrpc.svc.return = * @prot: the IP protocol number * @port: the port number */ -probe sunrpc.svc.register = kernel.function("svc_register") ?, - module("sunrpc").function("svc_register") ? +probe sunrpc.svc.register = kernel.function("svc_register") !, + module("sunrpc").function("svc_register") { sv_name = kernel_string($serv->sv_name) progname = kernel_string($serv->sv_program->pg_name) @@ -447,8 +452,8 @@ probe sunrpc.svc.register = kernel.function("svc_register") ?, argstr = sprintf("%s %s %d %d", sv_name, progname, prot, port) } -probe sunrpc.svc.register.return = kernel.function("svc_register").return ?, - module("sunrpc").function("svc_register").return ? +probe sunrpc.svc.register.return = kernel.function("svc_register").return !, + module("sunrpc").function("svc_register").return { name = "sunrpc.svc.register.return" retstr = returnstr(1) @@ -465,8 +470,8 @@ probe sunrpc.svc.register.return = kernel.function("svc_register").return ?, * @pg_nvers: the number of supported versions * @bufsize: the buffer size */ -probe sunrpc.svc.create = kernel.function("svc_create") ?, - module("sunrpc").function("svc_create") ? +probe sunrpc.svc.create = kernel.function("svc_create") !, + module("sunrpc").function("svc_create") { progname = kernel_string($prog->pg_name) prog = $prog->pg_prog @@ -477,8 +482,8 @@ probe sunrpc.svc.create = kernel.function("svc_create") ?, argstr = sprintf("%s %d %d %d", progname, prog, pg_nvers, bufsize) } -probe sunrpc.svc.create.return = kernel.function("svc_create").return ?, - module("sunrpc").function("svc_create").return ? +probe sunrpc.svc.create.return = kernel.function("svc_create").return !, + module("sunrpc").function("svc_create").return { name = "sunrpc.svc.create.return" retstr = returnstr(2) @@ -499,8 +504,8 @@ probe sunrpc.svc.create.return = kernel.function("svc_create").return ?, * @rpcbadfmt: the count of requests dropped for bad formats * @rpcbadauth: the count of requests drooped for authentication failure */ -probe sunrpc.svc.destroy = kernel.function("svc_destroy") ?, - module("sunrpc").function("svc_destroy") ? +probe sunrpc.svc.destroy = kernel.function("svc_destroy") !, + module("sunrpc").function("svc_destroy") { sv_name = kernel_string($serv->sv_name) /* service name */ sv_progname = kernel_string($serv->sv_program->pg_name) @@ -518,8 +523,8 @@ probe sunrpc.svc.destroy = kernel.function("svc_destroy") ?, argstr = sprintf("%s %d %d", sv_name, sv_prog, sv_nrthreads) } -probe sunrpc.svc.destroy.return = kernel.function("svc_destroy").return ?, - module("sunrpc").function("svc_destroy").return ? +probe sunrpc.svc.destroy.return = kernel.function("svc_destroy").return !, + module("sunrpc").function("svc_destroy").return { name = "sunrpc.svc.destroy.return" } @@ -539,8 +544,8 @@ probe sunrpc.svc.destroy.return = kernel.function("svc_destroy").return ?, * @rq_proc: the procedure number in the request * @rq_prot: the IP protocol of the reqeust */ -probe sunrpc.svc.process = kernel.function("svc_process") ?, - module("sunrpc").function("svc_process") ? +probe sunrpc.svc.process = kernel.function("svc_process") !, + module("sunrpc").function("svc_process") { %( kernel_v >= "2.6.19" %? sv_name = kernel_string($rqstp->rq_server->sv_name) /* service name */ @@ -563,8 +568,8 @@ probe sunrpc.svc.process = kernel.function("svc_process") ?, rq_xid, rq_prog, rq_vers, rq_proc) } -probe sunrpc.svc.process.return = kernel.function("svc_process").return ?, - module("sunrpc").function("svc_process").return ? +probe sunrpc.svc.process.return = kernel.function("svc_process").return !, + module("sunrpc").function("svc_process").return { name = "sunrpc.svc.process.return" retstr = returnstr(1) @@ -583,8 +588,8 @@ probe sunrpc.svc.process.return = kernel.function("svc_process").return ?, * @rq_proc: the procedure number in the request * @rq_prot: the IP protocol of the reqeust */ -probe sunrpc.svc.authorise = kernel.function("svc_authorise")?, - module("sunrpc").function("svc_authorise")? +probe sunrpc.svc.authorise = kernel.function("svc_authorise") !, + module("sunrpc").function("svc_authorise") { sv_name = kernel_string($rqstp->rq_server->sv_name) peer_ip = addr_from_rqst($rqstp) @@ -599,8 +604,8 @@ probe sunrpc.svc.authorise = kernel.function("svc_authorise")?, rq_vers, rq_proc, rq_prot) } -probe sunrpc.svc.authorise.return = kernel.function("svc_authorise").return ?, - module("sunrpc").function("svc_authorise").return ? +probe sunrpc.svc.authorise.return = kernel.function("svc_authorise").return !, + module("sunrpc").function("svc_authorise").return { name = "sunrpc.svc.authorise.return" retstr = returnstr(1) @@ -616,8 +621,8 @@ probe sunrpc.svc.authorise.return = kernel.function("svc_authorise").return ?, * @sv_nrthreads:the number of concurrent threads * @timeout: the timeout of waiting for data */ -probe sunrpc.svc.recv = kernel.function("svc_recv")?, - module("sunrpc").function("svc_recv")? +probe sunrpc.svc.recv = kernel.function("svc_recv") !, + module("sunrpc").function("svc_recv") { %( kernel_v >= "2.6.19" %? sv_name = kernel_string($rqstp->rq_server->sv_name) @@ -634,8 +639,8 @@ probe sunrpc.svc.recv = kernel.function("svc_recv")?, argstr = sprintf("%s %d", sv_name, timeout) } -probe sunrpc.svc.recv.return = kernel.function("svc_recv").return ?, - module("sunrpc").function("svc_recv").return ? +probe sunrpc.svc.recv.return = kernel.function("svc_recv").return !, + module("sunrpc").function("svc_recv").return { name = "sunrpc.svc.recv.return" retstr = returnstr(1) @@ -654,8 +659,8 @@ probe sunrpc.svc.recv.return = kernel.function("svc_recv").return ?, * @rq_proc: the procedure number in the request * @rq_prot: the IP protocol of the reqeust */ -probe sunrpc.svc.send = kernel.function("svc_send")?, - module("sunrpc").function("svc_send")? +probe sunrpc.svc.send = kernel.function("svc_send") !, + module("sunrpc").function("svc_send") { sv_name = kernel_string($rqstp->rq_server->sv_name) peer_ip = addr_from_rqst($rqstp) @@ -670,8 +675,8 @@ probe sunrpc.svc.send = kernel.function("svc_send")?, rq_xid, rq_prog, rq_vers, rq_proc, rq_prot) } -probe sunrpc.svc.send.return = kernel.function("svc_send").return ?, - module("sunrpc").function("svc_send").return ? +probe sunrpc.svc.send.return = kernel.function("svc_send").return !, + module("sunrpc").function("svc_send").return { name = "sunrpc.svc.send.return" retstr = returnstr(1) @@ -690,8 +695,8 @@ probe sunrpc.svc.send.return = kernel.function("svc_send").return ?, * @rq_proc: the procedure number in the request * @rq_prot: the IP protocol of the reqeust */ -probe sunrpc.svc.drop = kernel.function("svc_drop")?, - module("sunrpc").function("svc_drop")? +probe sunrpc.svc.drop = kernel.function("svc_drop") !, + module("sunrpc").function("svc_drop") { sv_name = kernel_string($rqstp->rq_server->sv_name) peer_ip = addr_from_rqst($rqstp) @@ -706,8 +711,8 @@ probe sunrpc.svc.drop = kernel.function("svc_drop")?, rq_xid, rq_prog, rq_vers, rq_proc, rq_prot) } -probe sunrpc.svc.drop.return = kernel.function("svc_drop").return ?, - module("sunrpc").function("svc_drop").return ? +probe sunrpc.svc.drop.return = kernel.function("svc_drop").return !, + module("sunrpc").function("svc_drop").return { name = "sunrpc.svc.drop.return" } @@ -741,8 +746,8 @@ probe sunrpc.sched.return = * @prot: the IP protocol in the RPC call * @tk_flags: the flags of the task */ -probe sunrpc.sched.new_task = kernel.function("rpc_new_task") ?, - module("sunrpc").function("rpc_new_task") ? +probe sunrpc.sched.new_task = kernel.function("rpc_new_task") !, + module("sunrpc").function("rpc_new_task") { xid = xid_from_clnt($clnt) prog = prog_from_clnt($clnt) @@ -754,8 +759,8 @@ probe sunrpc.sched.new_task = kernel.function("rpc_new_task") ?, argstr = sprintf("%d %d %d %d %d", xid, prog, vers, prot, flags) } -probe sunrpc.sched.new_task.return = kernel.function("rpc_new_task").return ?, - module("sunrpc").function("rpc_new_task").return ? +probe sunrpc.sched.new_task.return = kernel.function("rpc_new_task").return !, + module("sunrpc").function("rpc_new_task").return { name = "sunrpc.sched.new_task.return" retstr = returnstr(2) @@ -772,8 +777,8 @@ probe sunrpc.sched.new_task.return = kernel.function("rpc_new_task").return ?, * @prot: the IP protocol in the RPC call * @tk_flags: the flags of the task */ -probe sunrpc.sched.release_task = kernel.function("rpc_release_task") ?, - module("sunrpc").function("rpc_release_task") ? +probe sunrpc.sched.release_task = kernel.function("rpc_release_task") !, + module("sunrpc").function("rpc_release_task") { xid = xid_from_clnt($task->tk_client) prog = prog_from_clnt($task->tk_client) @@ -786,8 +791,8 @@ probe sunrpc.sched.release_task = kernel.function("rpc_release_task") ?, } probe sunrpc.sched.release_task.return = - kernel.function("rpc_release_task").return ?, - module("sunrpc").function("rpc_release_task").return ? + kernel.function("rpc_release_task").return !, + module("sunrpc").function("rpc_release_task").return { name = "sunrpc.sched.release_task.return" } @@ -805,8 +810,8 @@ probe sunrpc.sched.release_task.return = * @tk_pid: the debugging id of the task * @tk_flags: the flags of the task */ -probe sunrpc.sched.execute = kernel.function("__rpc_execute") ?, - module("sunrpc").function("__rpc_execute") ? +probe sunrpc.sched.execute = kernel.function("__rpc_execute") !, + module("sunrpc").function("__rpc_execute") { xid = xid_from_clnt($task->tk_client) prog = prog_from_clnt($task->tk_client) @@ -820,8 +825,8 @@ probe sunrpc.sched.execute = kernel.function("__rpc_execute") ?, tk_pid, tk_flags) } -probe sunrpc.sched.execute.return = kernel.function("__rpc_execute").return ?, - module("sunrpc").function("__rpc_execute").return ? +probe sunrpc.sched.execute.return = kernel.function("__rpc_execute").return !, + module("sunrpc").function("__rpc_execute").return { name = "sunrpc.sched.execute.return" @@ -845,8 +850,8 @@ probe sunrpc.sched.execute.return = kernel.function("__rpc_execute").return ?, * @tk_flags: the flags of the task * @delay: the time delayed */ -probe sunrpc.sched.delay = kernel.function("rpc_delay") ?, - module("sunrpc").function("rpc_delay") ? +probe sunrpc.sched.delay = kernel.function("rpc_delay") !, + module("sunrpc").function("rpc_delay") { xid = xid_from_clnt($task->tk_client) prog = prog_from_clnt($task->tk_client) @@ -861,8 +866,8 @@ probe sunrpc.sched.delay = kernel.function("rpc_delay") ?, prot, tk_pid, tk_flags, delay) } -probe sunrpc.sched.delay.return = kernel.function("rpc_delay").return ?, - module("sunrpc").function("rpc_delay").return ? +probe sunrpc.sched.delay.return = kernel.function("rpc_delay").return !, + module("sunrpc").function("rpc_delay").return { name = "sunrpc.sched.delay.return" } |