From ee493d55218218f1321cc03dc6add13d073b095e Mon Sep 17 00:00:00 2001 From: guanglei Date: Fri, 10 Nov 2006 10:01:21 +0000 Subject: [PATCH] bugfix of NFS event register codes for LKET bugfix of lket-b2a --- runtime/lket/b2a/lket_b2a.c | 3 +-- tapset/LKET/Changelog | 1 + tapset/LKET/register_event.stp | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/runtime/lket/b2a/lket_b2a.c b/runtime/lket/b2a/lket_b2a.c index ffbde3b94..1b19a672c 100644 --- a/runtime/lket/b2a/lket_b2a.c +++ b/runtime/lket/b2a/lket_b2a.c @@ -689,8 +689,7 @@ void register_evt_desc(FILE *infp, size_t size) len = strlen(evt_body+2)+2; if(!events_des[_HOOKID_REGSYSEVT][grpid][hookid]) events_des[_HOOKID_REGSYSEVT][grpid][hookid] = malloc(sizeof(event_desc)); - if(!events_des[_HOOKID_REGSYSEVT][grpid][hookid]->description) - events_des[_HOOKID_REGSYSEVT][grpid][hookid]->description = malloc(len); + events_des[_HOOKID_REGSYSEVT][grpid][hookid]->description = malloc(len); strncpy(events_des[_HOOKID_REGSYSEVT][grpid][hookid]->description, evt_body+2, len); #ifdef HAS_MYSQL diff --git a/tapset/LKET/Changelog b/tapset/LKET/Changelog index ed24205a7..c0d0c5f48 100644 --- a/tapset/LKET/Changelog +++ b/tapset/LKET/Changelog @@ -4,6 +4,7 @@ * register_event.stp: register sys events in embedded c codes for stap to better optimize the generated codes. + bugfix of nfs event register codes. 2006-11-09 Li Guanglei diff --git a/tapset/LKET/register_event.stp b/tapset/LKET/register_event.stp index 294487b7f..bd3e8bb00 100755 --- a/tapset/LKET/register_event.stp +++ b/tapset/LKET/register_event.stp @@ -752,6 +752,7 @@ function register_sys_events() _GROUP_NFS, _HOOKID_NFS_AOP_RELEASEPAGE_RETURN, "INT32","return"); +///FIXME _register_sys_event("nfs.proc.lookup.entry", _GROUP_NFS, _HOOKID_NFS_PROC_LOOKUP_ENTRY, "INT8:INT8:INT64:INT8:STRING", @@ -854,14 +855,6 @@ function register_sys_events() _GROUP_NFS, _HOOKID_NFS_PROC_RENAME_RETURN, "INT32","return"); - _register_sys_event("nfs.proc.create.entry", - _GROUP_NFS, _HOOKID_NFS_PROC_CREATE_ENTRY, - "INT8:INT8:INT64:INT8:STRING", - "major_device:minor_device:fileid:version:filename"); - _register_sys_event("nfs.proc.create.return", - _GROUP_NFS, _HOOKID_NFS_PROC_CREATE_RETURN, - "INT32","return"); - _register_sys_event("nfs.proc.remove.entry", _GROUP_NFS, _HOOKID_NFS_PROC_REMOVE_ENTRY, "INT8:INT8:INT64:INT8:STRING", @@ -870,11 +863,10 @@ function register_sys_events() _GROUP_NFS, _HOOKID_NFS_PROC_REMOVE_RETURN, "INT32", "return");; - _register_sys_event("nfsd.dispatch.entry", _GROUP_NFSD, _HOOKID_NFSD_DISPATCH_ENTRY, - "INT8:INT8:INT32:INT32:INT32:INT32", - "proto:version:xid:proc:prog:client_ip"); + "INT8:INT8:INT32:INT32:INT32", + "proto:version:xid:proc:client_ip"); _register_sys_event("nfsd.dispatch.return", _GROUP_NFSD, _HOOKID_NFSD_DISPATCH_RETURN, "INT32","return"); -- 2.43.5