use c global variables instead of stap global variables to avoid better performance(unfinished).

visit members in scripts for better safety check

8 files changed, 118 insertions, 82 deletions

diff --git a/tapset/LKET/Changelog b/tapset/LKET/Changelog
index 9942c85a..df255e63 100644
--- a/tapset/LKET/Changelog
+++ b/tapset/LKET/Changelog
@@ -1,3 +1,12 @@
+2006-11-15  Li Guanglei <guanglei@cn.ibm.com>
+
+	* aio.stp, iosyscall.stp, pagefault.stp, process.stp:
+	use c global variables instead of stap global variables
+	to avoid better performance.
+	* aio.stp, netdev.stp: visit members in scripts for 
+	better safety check.
+	* nfs.stp: bugfix to uncomment some functions.
+	
 2006-11-11  Li Guanglei <guanglei@cn.ibm.com>
 
 	* register_event.stp: pass integer values explicitly
diff --git a/tapset/LKET/aio.stp b/tapset/LKET/aio.stp
index d5e3625d..ea81d024 100755
--- a/tapset/LKET/aio.stp
+++ b/tapset/LKET/aio.stp
@@ -41,6 +41,10 @@ probe addevent.aio.return
  *  system call is sys_io_setup, which will create an aio_context 
  *  capable of receiving at least maxevents.
  */
+probe addevent.aio.io_setup = 
+	addevent.aio.io_setup.entry, addevent.aio.io_setup.return
+{}
+
 probe addevent.aio.io_setup.entry
 	+= _addevent.aio.io_setup.entry
 {
@@ -50,13 +54,13 @@ probe addevent.aio.io_setup.entry
 probe _addevent.aio.io_setup.entry
 	= syscall.io_setup
 {
-	log_aio_setup(HOOKID_AIO_IO_SETUP_ENTRY, maxevents, ctxp_uaddr)
+	log_aio_setup(maxevents, ctxp_uaddr)
 }
 
-function log_aio_setup(hookid:long, nr_events:long, ctxp_uaddr:long)
+function log_aio_setup(nr_events:long, ctxp_uaddr:long)
 %{
 	/* nr_events|ctxp_uaddr */
-	_lket_trace(_GROUP_AIO, THIS->hookid, "%4b%8b", 
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_SETUP_ENTRY, "%4b%8b", 
 		THIS->nr_events, THIS->ctxp_uaddr);
 %}
 
@@ -82,6 +86,10 @@ function log_aio_return(hookid:long, retval:long)
  * system call is sys_io_submit which will queue the nr iocbs 
  * pointed to by iocbpp_uaddr for processing.
  */
+probe addevent.aio.io_submit =
+	addevent.aio.io_submit.entry, addevent.aio.io_submit.return
+{}
+ 
 probe addevent.aio.io_submit.entry
 	+= _addevent.aio.io_submit.entry
 {
@@ -91,13 +99,13 @@ probe addevent.aio.io_submit.entry
 probe _addevent.aio.io_submit.entry
 	= syscall.io_submit
 {
-	log_aio_submit(HOOKID_AIO_IO_SUBMIT_ENTRY, ctx_id, nr, iocbpp_uaddr)
+	log_aio_submit(ctx_id, nr, iocbpp_uaddr)
 }
 
-function log_aio_submit(hookid:long, ctx_id:long, nr:long, iocbpp_uaddr:long)
+function log_aio_submit(ctx_id:long, nr:long, iocbpp_uaddr:long)
 %{
 	/* ctx_id | no_iocbs | iocbpp */
-	_lket_trace(_GROUP_AIO, THIS->hookid, "%8b%4b%8b", 
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_SUBMIT_ENTRY, "%8b%4b%8b", 
 		THIS->ctx_id, THIS->nr, THIS->iocbpp_uaddr);
 %}
 
@@ -116,6 +124,10 @@ probe _addevent.aio.io_submit.return
 /* Called by sys_io_submit, will iterate iocbpp and process them
  * one by one
  */
+probe addevent.aio.io_submit_one
+	= addevent.aio.io_submit_one.entry, addevent.aio.io_submit_one.return
+{}
+
 probe addevent.aio.io_submit_one.entry
 	+= _addevent.aio.io_submit_one.entry
 {
@@ -126,21 +138,24 @@ probe addevent.aio.io_submit_one.entry
 probe _addevent.aio.io_submit_one.entry
 	= kernel.function("io_submit_one")
 {
-	log_io_submit_one(HOOKID_AIO_IO_SUBMIT_ONE_ENTRY, $ctx, $user_iocb)	
+	log_io_submit_one($ctx, $user_iocb, $user_iocb->aio_lio_opcode,
+		$user_iocb->aio_reqprio, $user_iocb->aio_fildes, 
+		$user_iocb->aio_buf, $user_iocb->aio_nbytes, 
+		$user_iocb->aio_offset )	
 }
 
-function log_io_submit_one(hookid:long, ctx:long, user_iocb_uaddr:long)
+function log_io_submit_one(ctx:long, user_iocb_uaddr:long, aio_lio_opcode:long,
+		aio_reqprio:long, aio_fildes:long, aio_buf:long, aio_nbytes:long,
+		aio_offset:long)
 %{
-	struct iocb *user_iocb = (struct iocb *)((long)THIS->user_iocb_uaddr);
-
 	/* ctx | user_iocb_addr | aio_lio_opcode | >aio_reqprio |
 		aio_fildes | aio_buf | aio_nbytes | >aio_offset */
-	_lket_trace(_GROUP_AIO, THIS->hookid, 
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_SUBMIT_ONE_ENTRY, 
 		"%8b%8b%2b%2b%4b%8b%8b%8b", 
-		THIS->ctx, THIS->user_iocb_uaddr, (_FMT_)user_iocb->aio_lio_opcode, 
-		(_FMT_)user_iocb->aio_reqprio, (_FMT_)user_iocb->aio_fildes, 
-		(_FMT_)user_iocb->aio_buf, (_FMT_)user_iocb->aio_nbytes, 
-		(_FMT_)user_iocb->aio_offset);
+		THIS->ctx, THIS->user_iocb_uaddr, THIS->aio_lio_opcode, 
+		THIS->aio_reqprio, THIS->aio_fildes, 
+		THIS->aio_buf, THIS->aio_nbytes, 
+		THIS->aio_offset);
 %}
 
 probe addevent.aio.io_submit_one.return
@@ -160,6 +175,10 @@ probe _addevent.aio.io_submit_one.return
  * system call is sys_io_destroy, which will destroy the aio_context 
  * specified.
  */
+probe addevent.aio.io_destroy =
+	addevent.aio.io_destroy.entry, addevent.aio.io_destroy.return
+{}
+
 probe addevent.aio.io_destroy.entry
 	+= _addevent.aio.io_destroy.entry
 {
@@ -169,12 +188,12 @@ probe addevent.aio.io_destroy.entry
 probe _addevent.aio.io_destroy.entry
 	= syscall.io_destroy
 {
-	log_io_destroy(HOOKID_AIO_IO_DESTROY_ENTRY, ctx)
+	log_io_destroy(ctx)
 }
 
-function log_io_destroy(hookid:long, ctx:long)
+function log_io_destroy(ctx:long)
 %{
-	_lket_trace(_GROUP_AIO, THIS->hookid, "%8b", THIS->ctx);
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_DESTROY_ENTRY, "%8b", THIS->ctx);
 %}
 
 
@@ -196,6 +215,10 @@ probe _addevent.aio.io_destroy.return
  * least min_nr events and up to nr events from the completion queue 
  * for the aio_context specified by ctx_id.
  */
+probe addevent.aio.io_getevents
+	= addevent.aio.io_getevents.entry, addevent.aio.io_getevents.return
+{}
+
 probe addevent.aio.io_getevents.entry
         += _addevent.aio.io_getevents.entry
 {
@@ -205,11 +228,10 @@ probe addevent.aio.io_getevents.entry
 probe _addevent.aio.io_getevents.entry
         = syscall.io_getevents
 {
-	log_io_getevents(HOOKID_AIO_IO_GETEVENTS_ENTRY, ctx_id, 
-		min_nr, nr, events_uaddr, timeout_uaddr)
+	log_io_getevents(ctx_id, min_nr, nr, events_uaddr, timeout_uaddr)
 }
 
-function log_io_getevents(hookid:long, ctx_id:long, min_nr:long, nr:long, 
+function log_io_getevents(ctx_id:long, min_nr:long, nr:long, 
 		events_uaddr:long, timeout:long)
 %{
 	struct timespec __user *timeout = (struct timespec *)((long)THIS->timeout);
@@ -218,7 +240,7 @@ function log_io_getevents(hookid:long, ctx_id:long, min_nr:long, nr:long,
 	if (unlikely(copy_from_user(&ts, timeout, sizeof(ts))))
 		return;
 
-	_lket_trace(_GROUP_AIO, THIS->hookid,
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_GETEVENTS_ENTRY,
 		"%8b%4b%4b%8b%4b%4b", THIS->ctx_id, THIS->min_nr,
 		THIS->nr, THIS->events_uaddr, (_FMT_)ts.tv_sec, 
 		(_FMT_)ts.tv_nsec);
@@ -241,6 +263,10 @@ probe _addevent.aio.io_getevents.return
  * system call is sys_io_cancel, which will attempt to cancel 
  * an iocb previously passed to io_submit.
  */
+probe addevent.aio.io_cancel
+	= addevent.aio.io_cancel.entry, addevent.aio.io_cancel.return
+{}
+
 probe addevent.aio.io_cancel.entry
 	+= _addevent.aio.io_cancel.entry
 {
@@ -250,13 +276,12 @@ probe addevent.aio.io_cancel.entry
 probe _addevent.aio.io_cancel.entry
 	= syscall.io_cancel
 {
-	log_aio_cancel(HOOKID_AIO_IO_CANCEL_ENTRY, ctx_id, 
-		iocb_uaddr, result_uaddr)
+	log_aio_cancel(ctx_id, iocb_uaddr, result_uaddr)
 }
 
-function log_aio_cancel(hookid:long, ctx_id:long, iocb_uaddr:long, result_uaddr:long)
+function log_aio_cancel(ctx_id:long, iocb_uaddr:long, result_uaddr:long)
 %{
-	_lket_trace(_GROUP_AIO, THIS->hookid, "%8b%8b%8b",
+	_lket_trace(_GROUP_AIO, _HOOKID_AIO_IO_CANCEL_ENTRY, "%8b%8b%8b",
 		THIS->ctx_id, THIS->iocb_uaddr, THIS->result_uaddr);
 %}
 
diff --git a/tapset/LKET/iosyscall.stp b/tapset/LKET/iosyscall.stp
index 3e1c60aa..8fa8d794 100755
--- a/tapset/LKET/iosyscall.stp
+++ b/tapset/LKET/iosyscall.stp
@@ -74,7 +74,7 @@ probe addevent.iosyscall.open.entry
 probe _addevent.iosyscall.open.entry 
 	= syscall.open
 {
-	log_iosyscall_open(HOOKID_IOSYSCALL_OPEN_ENTRY, filename, flags, mode)
+	log_iosyscall_open(filename, flags, mode)
 }
 
 probe addevent.iosyscall.open.return
@@ -89,15 +89,15 @@ probe _addevent.iosyscall.open.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_OPEN_RETURN, $return)
 }
 
-function log_iosyscall_open(hookid:long, filename:string, flags:long, mode:long)
+function log_iosyscall_open(filename:string, flags:long, mode:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, 
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_OPEN_ENTRY,
 		"%0s%4b%4b", THIS->filename, THIS->flags, THIS->mode);
 %}
 
 function log_iosyscall_return(hookid:long, ret_val:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, "%8b", (_FMT_)THIS->ret_val);
+	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, "%8b", THIS->ret_val);
 %}
 
 /*
@@ -116,7 +116,7 @@ probe addevent.iosyscall.close.entry
 probe _addevent.iosyscall.close.entry 
 	= syscall.close
 {
-	log_iosyscall_close(HOOKID_IOSYSCALL_CLOSE_ENTRY,fd)
+	log_iosyscall_close(fd)
 }
 
 probe addevent.iosyscall.close.return
@@ -131,9 +131,9 @@ probe _addevent.iosyscall.close.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_CLOSE_RETURN, $return)
 }
 
-function log_iosyscall_close(hookid:long, fd:long)
+function log_iosyscall_close(fd:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, "%8b", THIS->fd);
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_CLOSE_ENTRY, "%8b", THIS->fd);
 %}
 
 /*
@@ -152,7 +152,7 @@ probe addevent.iosyscall.read.entry
 probe _addevent.iosyscall.read.entry
 	= syscall.read
 {
-	log_iosyscall_read_write(HOOKID_IOSYSCALL_READ_ENTRY, fd, buf_uaddr, count)
+	log_iosyscall_read(fd, buf_uaddr, count)
 }
 
 probe addevent.iosyscall.read.return
@@ -183,7 +183,7 @@ probe addevent.iosyscall.write.entry
 probe _addevent.iosyscall.write.entry
 	= syscall.write
 {
-	log_iosyscall_read_write(HOOKID_IOSYSCALL_WRITE_ENTRY, fd, buf_uaddr, count)
+	log_iosyscall_write(fd, buf_uaddr, count)
 }
 
 probe addevent.iosyscall.write.return
@@ -198,13 +198,19 @@ probe _addevent.iosyscall.write.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_WRITE_RETURN, $return)
 }
 	
-function log_iosyscall_read_write(hookid:long, fd:long, buf_uaddr:long,
-		count:long)
+function log_iosyscall_read(fd:long, buf_uaddr:long, count:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, "%8b%8b%8b",
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_READ_ENTRY, "%8b%8b%8b",
+		THIS->fd, THIS->buf_uaddr, THIS->count);
+%}
+
+function log_iosyscall_write(fd:long, buf_uaddr:long, count:long)
+%{
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_WRITE_ENTRY, "%8b%8b%8b",
 		THIS->fd, THIS->buf_uaddr, THIS->count);
 %}
 
+
 /*
   addevent.iosyscall.readv.{entry,return}
 */
@@ -361,7 +367,7 @@ probe addevent.iosyscall.readahead.entry
 probe _addevent.iosyscall.readahead.entry
 	= syscall.readahead
 {
-	log_iosyscall_readahead(HOOKID_IOSYSCALL_READAHEAD_ENTRY, fd, offset, count)
+	log_iosyscall_readahead(fd, offset, count)
 }
 
 probe addevent.iosyscall.readahead.return
@@ -377,9 +383,9 @@ probe _addevent.iosyscall.readahead.return
 }
 
 
-function log_iosyscall_readahead(hookid:long, fd:long, offset:long,count:long)
+function log_iosyscall_readahead(fd:long, offset:long,count:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid,
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_READAHEAD_ENTRY,
 		"%8b%8b%8b", THIS->fd, THIS->offset, THIS->count);
 %}
 
@@ -399,8 +405,7 @@ probe addevent.iosyscall.sendfile.entry
 probe _addevent.iosyscall.sendfile.entry
 	= syscall.sendfile
 {
-	log_iosyscall_sendfile(HOOKID_IOSYSCALL_SENDFILE_ENTRY,
-		out_fd, in_fd, offset_uaddr, count)
+	log_iosyscall_sendfile(out_fd, in_fd, offset_uaddr, count)
 }
 
 probe addevent.iosyscall.sendfile.return
@@ -415,12 +420,10 @@ probe _addevent.iosyscall.sendfile.return
 	 log_iosyscall_return(HOOKID_IOSYSCALL_SENDFILE_RETURN, $return)
 }
 	
-function log_iosyscall_sendfile(hookid:long, out_fd:long, in_fd:long,
-		offset_uaddr:long, count:long)
+function log_iosyscall_sendfile(out_fd:long, in_fd:long, offset_uaddr:long, count:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid, "%8b%8b%8b%8b",
-		THIS->out_fd, THIS->in_fd, THIS->offset_uaddr,
-		THIS->count);
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_SENDFILE_ENTRY, "%8b%8b%8b%8b",
+		THIS->out_fd, THIS->in_fd, THIS->offset_uaddr, THIS->count);
 %}
 
 /*
@@ -439,7 +442,7 @@ probe addevent.iosyscall.lseek.entry
 probe _addevent.iosyscall.lseek.entry
 	= syscall.lseek
 {
-	log_iosyscall_lseek(HOOKID_IOSYSCALL_LSEEK_ENTRY, fildes, offset, whence)
+	log_iosyscall_lseek(fildes, offset, whence)
 }
 
 probe addevent.iosyscall.lseek.return
@@ -454,9 +457,9 @@ probe _addevent.iosyscall.lseek.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_LSEEK_RETURN, $return)
 }
 
-function log_iosyscall_lseek(hookid:long, fd:long, offset:long, whence:long)
+function log_iosyscall_lseek(fd:long, offset:long, whence:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid,
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_LSEEK_ENTRY,
 		"%8b%8b%1b", THIS->fd, THIS->offset, THIS->whence);
 %}
 
@@ -476,8 +479,7 @@ probe addevent.iosyscall.llseek.entry
 probe _addevent.iosyscall.llseek.entry
 	= syscall.llseek
 {
-	log_iosyscall_llseek(HOOKID_IOSYSCALL_LLSEEK_ENTRY, 
-		fd, offset_high, offset_low, result_uaddr, whence)
+	log_iosyscall_llseek(fd, offset_high, offset_low, result_uaddr, whence)
 }
 
 probe addevent.iosyscall.llseek.return
@@ -492,10 +494,10 @@ probe _addevent.iosyscall.llseek.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_LLSEEK_RETURN, $return)
 }
 
-function log_iosyscall_llseek(hookid:long, fd:long, offset_high:long, 
+function log_iosyscall_llseek(fd:long, offset_high:long, 
 		offset_low:long, result_uaddr:long, whence:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid,
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_LLSEEK_ENTRY,
 		"%8b%8b%8b%8b%1b", THIS->fd, THIS->offset_high,
 		THIS->offset_low, THIS->result_uaddr, THIS->whence);
 %}
@@ -516,7 +518,7 @@ probe addevent.iosyscall.sync.entry
 probe _addevent.iosyscall.sync.entry
 	= syscall.sync
 {
-	log_iosyscall_sync(HOOKID_IOSYSCALL_SYNC_ENTRY)
+	log_iosyscall_sync()
 }
 
 probe addevent.iosyscall.sync.return
@@ -531,7 +533,7 @@ probe _addevent.iosyscall.sync.return
 	 log_iosyscall_return(HOOKID_IOSYSCALL_SYNC_RETURN, $return)
 }
 
-function log_iosyscall_sync(hookid:long)
+function log_iosyscall_sync()
 %{
 	int GroupID = _GROUP_IOSYSCALL;
 	int hookID = _HOOKID_IOSYSCALL_SYNC_ENTRY;
@@ -539,7 +541,7 @@ function log_iosyscall_sync(hookid:long)
         do_gettimeofday(&tv); 
 #if defined(ASCII_TRACE)
 	_stp_printf("%d%d%d%d%d%d%d%d", _GROUP_IOSYSCALL,
-		THIS->hookid, tv.tv_sec, tv.tv_usec,
+		_HOOKID_IOSYSCALL_SYNC_ENTRY, tv.tv_sec, tv.tv_usec,
 		current->tgid, current->parent->pid, current->pid,
                 current->thread_info->cpu);
 
@@ -655,7 +657,7 @@ probe addevent.iosyscall.flock.entry
 probe _addevent.iosyscall.flock.entry
 	= syscall.flock
 {
-	log_iosyscall_flock(HOOKID_IOSYSCALL_FLOCK_ENTRY, fd, operation)
+	log_iosyscall_flock(fd, operation)
 }
 
 probe addevent.iosyscall.flock.return
@@ -670,8 +672,8 @@ probe _addevent.iosyscall.flock.return
 	log_iosyscall_return(HOOKID_IOSYSCALL_FLOCK_RETURN, $return)
 }
 
-function log_iosyscall_flock(hookid:long, fd:long, operation:long)
+function log_iosyscall_flock(fd:long, operation:long)
 %{
-	_lket_trace(_GROUP_IOSYSCALL, THIS->hookid,
+	_lket_trace(_GROUP_IOSYSCALL, _HOOKID_IOSYSCALL_FLOCK_ENTRY,
 		"%8b%4b", THIS->fd, THIS->operation);
 %}
diff --git a/tapset/LKET/netdev.stp b/tapset/LKET/netdev.stp
index 2b8acee0..2f7bfc74 100755
--- a/tapset/LKET/netdev.stp
+++ b/tapset/LKET/netdev.stp
@@ -25,7 +25,7 @@ probe _addevent.netdev.receive
 	=  netdev.receive
 {
 	/* no need to filter by pid */
-	log_netdev_extra(HOOKID_NETDEV_RECEIVE,$skb)
+	log_netdev_extra(HOOKID_NETDEV_RECEIVE, dev_name, length, protocol, truesize)
 }
 
 /* Queue a buffer for transmission to a network device */
@@ -38,12 +38,12 @@ probe addevent.netdev.transmit
 probe _addevent.netdev.transmit
 	=  netdev.transmit
 {
-	log_netdev_extra(HOOKID_NETDEV_TRANSMIT, $skb)
+	log_netdev_extra(HOOKID_NETDEV_TRANSMIT, dev_name, length, protocol, truesize)
 }
 
-function log_netdev_extra(var_id:long, var:long)
+function log_netdev_extra(var_id:long, dev_name:string, len:long, 
+			protocol:long, truesize:long)
 %{
-	struct sk_buff *skb = (struct sk_buff *)((long)THIS->var);
 
 	/* dev_name | Length of actual data | protocol | Buffer size 
 
@@ -62,6 +62,6 @@ function log_netdev_extra(var_id:long, var:long)
 		86DD    IPv6
 	*/
 
-	_lket_trace(_GROUP_NETDEV, THIS->var_id, "%0s%4b%2b%4b", skb->dev->name, 
-		(_FMT_)skb->len, (_FMT_)skb->protocol, (_FMT_)skb->truesize);
+	_lket_trace(_GROUP_NETDEV, THIS->var_id, "%0s%4b%2b%4b", THIS->dev_name,
+		THIS->len, THIS->protocol, THIS->truesize);
 %}
diff --git a/tapset/LKET/nfs.stp b/tapset/LKET/nfs.stp
index 81061863..82cd92d2 100755
--- a/tapset/LKET/nfs.stp
+++ b/tapset/LKET/nfs.stp
@@ -265,8 +265,7 @@ function log_fop_open(s_id:long,ino:long,flag :long , filename:string)
 
 	getdevice(s_id,&major,&minor);
 	_lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_OPEN_ENTRY,"%1b%1b%8b%4b%0s",
-		(_FMT_)major,(_FMT_)minor,
-			                                     THIS->ino,THIS->flag,THIS->filename);
+		(_FMT_)major,(_FMT_)minor, THIS->ino,THIS->flag,THIS->filename);
 %}
 
 probe addevent.nfs.fop.open.return
@@ -470,6 +469,7 @@ function log_fop_check_flags(flag:long)
 	_lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_CHECKFLAGS_ENTRY,"%4b",THIS->flag);
 %}
 
+///FIXME: unable to resovle $return
 /*
 probe addevent.nfs.fop.check_flags.return
       += _addevent.nfs.fop.check_flags.return
@@ -703,7 +703,7 @@ probe addevent.nfs.aop.set_page_dirty.entry
 probe _addevent.nfs.aop.set_page_dirty.entry
       = nfs.aop.set_page_dirty
 {
-//	log_aop_set_page_dirty(__page,page_flag)
+	log_aop_set_page_dirty(__page,page_flag)
 }
 
 function log_aop_set_page_dirty(__page:long,page_flag:long)
@@ -721,7 +721,7 @@ probe addevent.nfs.aop.set_page_dirty.return
 probe _addevent.nfs.aop.set_page_dirty.return
      = nfs.aop.set_page_dirty.return
 {
-	//log_nfs_return(HOOKID_NFS_AOP_SETPAGEDIRTY_RETURN,$return)
+	log_nfs_return(HOOKID_NFS_AOP_SETPAGEDIRTY_RETURN,$return)
 }
 
 probe addevent.nfs.aop.release_page.entry
diff --git a/tapset/LKET/pagefault.stp b/tapset/LKET/pagefault.stp
index c643a7d5..214855fb 100755
--- a/tapset/LKET/pagefault.stp
+++ b/tapset/LKET/pagefault.stp
@@ -5,10 +5,10 @@
 // Public License (GPL); either version 2, or (at your option) any
 // later version.
 
-function log_pagefault_tracedata(var_id:long, var_addr:long, var_rwflag:long)
+function log_pagefault_tracedata(var_addr:long, var_rwflag:long)
 %{
-	_lket_trace(_GROUP_PAGEFAULT, THIS->var_id, "%8b%1b", 
-		(int64_t)(THIS->var_addr), (_FMT_)((THIS->var_rwflag)?1:0)); 
+	_lket_trace(_GROUP_PAGEFAULT, _HOOKID_PAGEFAULT, "%8b%1b", 
+		THIS->var_addr, (_FMT_)((THIS->var_rwflag)?1:0)); 
 %}
 
 
@@ -22,5 +22,5 @@ probe addevent.pagefault
 probe _addevent.pagefault
 	=  vm.pagefault
 {
-	log_pagefault_tracedata(HOOKID_PAGEFAULT, $address, $write_access)
+	log_pagefault_tracedata($address, $write_access)
 }
diff --git a/tapset/LKET/process.stp b/tapset/LKET/process.stp
index b30dacec..32a0f995 100755
--- a/tapset/LKET/process.stp
+++ b/tapset/LKET/process.stp
@@ -9,23 +9,23 @@
    will be turned on by default */
 
 /* record the newly created process name */
-function log_execve_tracedata(var_id:long, var:long)
+function log_execve_tracedata(var:long)
 %{
 	long tmp=(long)THIS->var;
-	_lket_trace(_GROUP_PROCESS, THIS->var_id, "%4b%0s", 
+	_lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_EXECVE, "%4b%0s", 
 		(_FMT_)current->tgid, (char *)tmp); 
 %}
 
 
 /* record the newly forked process id */
-function log_fork_tracedata(var_id:long, task:long)
+function log_fork_tracedata(task:long)
 %{
 	/*
 	pid_t pid = (pid_t)THIS->var;	
 	_lket_trace(_GROUP_PROCESS, THIS->var_id, "%4b", (_FMT_)pid); 
 	*/
 	struct task_struct *task = (struct task_struct *)((long)THIS->task);
-	_lket_trace(_GROUP_PROCESS, THIS->var_id, "%4b%4b%4b", (_FMT_)task->pid, 
+	_lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_FORK, "%4b%4b%4b", (_FMT_)task->pid, 
 		(_FMT_)task->tgid, (_FMT_)task->parent->tgid); 
 %}
 
@@ -80,7 +80,7 @@ probe _lket_internal.process.execve
 	=  process.exec
 {
 	if(stoptrace_exec==1) next;
-	log_execve_tracedata(HOOKID_PROCESS_EXECVE, $filename)
+	log_execve_tracedata($filename)
 }
 
 probe lket_internal.process.fork
@@ -93,5 +93,5 @@ probe _lket_internal.process.fork
 	= process.create
 {
 	if(stoptrace_fork==1) next;
-	log_fork_tracedata(HOOKID_PROCESS_FORK, $return)
+	log_fork_tracedata($return)
 }
diff --git a/tapset/LKET/register_event.stp b/tapset/LKET/register_event.stp
index 39c56948..456ebadc 100755
--- a/tapset/LKET/register_event.stp
+++ b/tapset/LKET/register_event.stp
@@ -684,6 +684,7 @@ function register_sys_events()
 	_register_sys_event("nfs.fop.check_flags.entry",
 		_GROUP_NFS, _HOOKID_NFS_FOP_CHECKFLAGS_ENTRY,
                 "INT32","flag");		
+	////TODO unable to resovle $return
 	_register_sys_event("nfs.fop.check_flags.return",
 		_GROUP_NFS, _HOOKID_NFS_FOP_CHECKFLAGS_RETURN,
                 "INT32","return");
@@ -752,7 +753,6 @@ 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",