summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguanglei <guanglei>2006-11-10 10:01:21 +0000
committerguanglei <guanglei>2006-11-10 10:01:21 +0000
commitee493d55218218f1321cc03dc6add13d073b095e (patch)
tree6553a7417fdfb84b50742d58eba456a1190903df
parentad71050932719ef908e2ce9c9f7cd090a8394770 (diff)
downloadsystemtap-steved-ee493d55218218f1321cc03dc6add13d073b095e.tar.gz
systemtap-steved-ee493d55218218f1321cc03dc6add13d073b095e.tar.xz
systemtap-steved-ee493d55218218f1321cc03dc6add13d073b095e.zip
bugfix of NFS event register codes for LKET
bugfix of lket-b2a
-rw-r--r--runtime/lket/b2a/lket_b2a.c3
-rw-r--r--tapset/LKET/Changelog1
-rwxr-xr-xtapset/LKET/register_event.stp14
3 files changed, 5 insertions, 13 deletions
diff --git a/runtime/lket/b2a/lket_b2a.c b/runtime/lket/b2a/lket_b2a.c
index ffbde3b9..1b19a672 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 ed24205a..c0d0c5f4 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 <guanglei@cn.ibm.com>
diff --git a/tapset/LKET/register_event.stp b/tapset/LKET/register_event.stp
index 294487b7..bd3e8bb0 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");