From bc558b71c0e21f56e4dde18345662267bc69b73d Mon Sep 17 00:00:00 2001 From: guanglei Date: Wed, 20 Dec 2006 08:41:04 +0000 Subject: bugfix of LKET rpc event register codes. --- tapset/LKET/Changelog | 6 ++++++ tapset/LKET/register_event.stp | 16 ++++++++-------- tapset/LKET/rpc.stp | 8 ++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tapset/LKET/Changelog b/tapset/LKET/Changelog index fc4c30dd..85fc5c24 100644 --- a/tapset/LKET/Changelog +++ b/tapset/LKET/Changelog @@ -1,3 +1,9 @@ +2006-12-20 Li Guanglei + + From Gui Jian + * rpc.stp, register_event.stp: bugfix of rpc event + register codes. + 2006-12-11 Li Guanglei From Gui Jian diff --git a/tapset/LKET/register_event.stp b/tapset/LKET/register_event.stp index 333471e8..98999355 100755 --- a/tapset/LKET/register_event.stp +++ b/tapset/LKET/register_event.stp @@ -439,8 +439,8 @@ function register_sys_events() _register_sys_event("sunrpc.clnt.clone_client.entry", _GROUP_SUNRPC, _HOOKID_SUNRPC_CLNT_CLONE_CLIENT_ENTRY, - "STRING:INT64:INT16:INT16:INT32", - "server:prog:tasks:clones:rpccount"); + "STRING:INT64:INT8:INT16:INT16:INT8", + "server:prog:vers:prot:port:authflavor"); _register_sys_event("sunrpc.clnt.clone_client.return", _GROUP_SUNRPC, _HOOKID_SUNRPC_CLNT_CLONE_CLIENT_RETURN, "INT64", "return"); @@ -495,8 +495,8 @@ function register_sys_events() _register_sys_event("sunrpc.svc.create.entry", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_CREATE_ENTRY, - "INT64:INT8:INT8", - "program:high_version:num_versions"); + "INT64:INT8:INT32", + "prog:nvers:bufsize"); _register_sys_event("sunrpc.svc.create.return", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_CREATE_RETURN, "INT64", "return"); @@ -520,16 +520,16 @@ function register_sys_events() _register_sys_event("sunrpc.svc.authorise.entry", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_AUTHORISE_ENTRY, - "INT64:INT64:INT64:INT8:INT64", - "peer_ip:xid:prog:vers:proc"); + "STRING:INT64:INT64:INT64:INT8:INT64", + "service:peer_ip:xid:prog:vers:proc"); _register_sys_event("sunrpc.svc.authorise.return", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_AUTHORISE_RETURN, "INT64", "return"); _register_sys_event("sunrpc.svc.send.entry", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_SEND_ENTRY, - "STRING:INT64:INT64:INT64:INT64:INT8:INT64", - "sv_name:peer_ip:sv_prog:xid:prog:vers:proc"); + "STRING:INT64:INT64:INT64:INT8:INT64", + "sv_name:peer_ip:xid:prog:vers:proc"); _register_sys_event("sunrpc.svc.send.return", _GROUP_SUNRPC, _HOOKID_SUNRPC_SVC_SEND_RETURN, "INT64", "return"); diff --git a/tapset/LKET/rpc.stp b/tapset/LKET/rpc.stp index 256df6e9..50555ca9 100755 --- a/tapset/LKET/rpc.stp +++ b/tapset/LKET/rpc.stp @@ -472,7 +472,7 @@ probe _addevent.sunrpc.svc.authorise.return function log_sunrpc_svc_authorise(hookid:long, sv_name:string, peer_ip:long, rq_xid:long, rq_prog:long, rq_vers:long, rq_proc:long) %{ - _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%s%8b%8b%8b%1b%8b", + _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%0s%8b%8b%8b%1b%8b", THIS->sv_name, (_FMT_)THIS->peer_ip, (_FMT_)THIS->rq_xid, (_FMT_)THIS->rq_prog, (_FMT_)THIS->rq_vers, (_FMT_)THIS->rq_proc); @@ -507,7 +507,7 @@ probe _addevent.sunrpc.svc.recv.return function log_sunrpc_svc_recv(hookid:long, sv_name:string, timeout:long) %{ - _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%s%8b", THIS->sv_name, + _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%0s%8b", THIS->sv_name, (_FMT_)THIS->timeout); %} @@ -540,7 +540,7 @@ probe _addevent.sunrpc.svc.send.return function log_sunrpc_svc_send(hookid:long, sv_name:string, peer_ip:long, rq_xid:long, rq_prog:long, rq_vers:long, rq_proc:long) %{ - _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%s%8b%8b%8b%8b%1b%8b", + _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%0s%8b%8b%8b%1b%8b", THIS->sv_name, (_FMT_)THIS->peer_ip, (_FMT_)THIS->rq_xid, (_FMT_)THIS->rq_prog, (_FMT_)THIS->rq_vers, (_FMT_)THIS->rq_proc); @@ -575,7 +575,7 @@ probe _addevent.sunrpc.svc.drop.return function log_sunrpc_svc_drop(hookid:long, sv_name:string, peer_ip:long, rq_xid:long, rq_prog:long, rq_vers:long, rq_proc:long) %{ - _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%s%8b%8b%8b%1b%8b", + _lket_trace(_GROUP_SUNRPC, THIS->hookid, "%0s%8b%8b%8b%1b%8b", THIS->sv_name, (_FMT_)THIS->peer_ip, (_FMT_)THIS->rq_xid, (_FMT_)THIS->rq_prog, (_FMT_)THIS->rq_vers, (_FMT_)THIS->rq_proc); -- cgit