*.stp:

 Make all integers passed into _lket_trace() casted into int64_t explicitly.
 Delete calling to filter_by_pid()

* nfs*.stp:
 Change addevent.*.entries to addevent.*.entry

1 files changed, 86 insertions, 71 deletions

diff --git a/tapset/LKET/nfs_proc.stp b/tapset/LKET/nfs_proc.stp
index 82623bc5..75d8e6ff 100755
--- a/tapset/LKET/nfs_proc.stp
+++ b/tapset/LKET/nfs_proc.stp
@@ -9,44 +9,44 @@
    #include <linux/nfs_fs.h>
 %}
 %{
-        void getdevice(char *sid,int * major,int* min)
-        {
-                char c;
-                char * minor, *p;
-                int i = 0;
-
-                c = ':';
-                minor = strchr(sid,c);
-                minor++;
-
-                p = sid;
-                c = *p;
-                p++;
-                while(c != ':')
-                {
-                        if(c > '0' || c < '9')
-                                i = i << 4 | (c - 48);
-                        else if (c > 'a' || c < 'f')
-                                i = i<< 4 | (c-87);
-                        c = *p;
-                        p++;
-                }
-                *major = i;
-
-                p = minor;
-                c = *minor;
-                p++;
-                while(c != 0)
-                {
-                        if(c > '0' || c < '9')
-                                i = i << 4 | (c - 48);
-                        else if (c > 'a' || c < 'f')
-                                i = i<< 4 | (c-87);
-                        c = *p;
-                        p++;
-                }
-                *min = i;
-        }
+void getdevice(char *sid,int * major,int* min)
+{
+	char c;
+	char * minor, *p;
+	int i = 0;
+
+	c = ':';
+	minor = strchr(sid,c);
+	minor++;
+
+	p = sid;
+	c = *p;
+	p++;
+	while(c != ':')
+	{
+		if(c > '0' || c < '9')
+			i = i << 4 | (c - 48);
+		else if (c > 'a' || c < 'f')
+			i = i<< 4 | (c-87);
+		c = *p;
+		p++;
+	}
+	*major = i;
+
+	p = minor;
+	c = *minor;
+	p++;
+	while(c != 0)
+	{
+		if(c > '0' || c < '9')
+			i = i << 4 | (c - 48);
+		else if (c > 'a' || c < 'f')
+			i = i<< 4 | (c-87);
+		c = *p;
+		p++;
+	}
+	*min = i;
+}
 %}
 
 probe never
@@ -54,11 +54,11 @@ probe never
 	printf("%d",GROUP_NFS)
 }
 probe addevent.nfs.proc
-     = addevent.nfs.proc.entries,
+     = addevent.nfs.proc.entry,
        addevent.nfs.proc.return
 {}
 
-probe addevent.nfs.proc.entries
+probe addevent.nfs.proc.entry
      = addevent.nfs.proc.lookup.entry,
        addevent.nfs.proc.read.entry,
        addevent.nfs.proc.write.entry,
@@ -110,8 +110,9 @@ function log_proc_lookup(version:long,dir:long,filename:string)
 	int major_device,minor_device;
 
 	getdevice(sb->s_id,&major_device,&minor_device);
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_LOOKUP_ENTRY,"%1b%1b%8b%1b%0s",(_FMT_)major_device,(_FMT_)minor_device,
-                                                  NFS_FILEID(dir),THIS->version,THIS->filename);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_LOOKUP_ENTRY,"%1b%1b%8b%1b%0s",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(dir),THIS->version,THIS->filename);
 %}
 
 probe addevent.nfs.proc.lookup.return
@@ -146,8 +147,9 @@ function log_proc_read(version:long,rdata:long,count:long,offset:long)
 	int major_device,minor_device;
 
 	getdevice(sb->s_id,&major_device,&minor_device);
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READ_ENTRY,"%1b%1b%8b%1b%4b%8b",major_device,minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READ_ENTRY,"%1b%1b%8b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
 %}
 
 probe addevent.nfs.proc.read.return
@@ -182,8 +184,9 @@ function log_proc_write(version:long,wdata:long,count:long,offset:long)
 	int major_device,minor_device;
 
 	getdevice(sb->s_id,&major_device,&minor_device);
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITE_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device,
-                                   NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITE_ENTRY,"%1b%1b%8b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
 %}
 
 probe addevent.nfs.proc.write.return
@@ -219,8 +222,9 @@ function log_proc_commit(version:long,cdata:long,count:long,offset:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMIT_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMIT_ENTRY,"%1b%1b%8b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
 %}
 
 probe addevent.nfs.proc.commit.return
@@ -256,8 +260,9 @@ function log_proc_read_setup(version:long,data:long,count:long,offset:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
 %}
 
 probe addevent.nfs.proc.write_setup.entry
@@ -281,8 +286,9 @@ function log_proc_write_setup(version:long,data:long,count:long,offset:long,how:
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITESETUP_ENTRY,"%1b%1b%8b%1b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->how,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITESETUP_ENTRY,"%1b%1b%8b%1b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->how,THIS->count,THIS->offset);
 %}
 
 
@@ -307,8 +313,9 @@ function log_proc_commit_setup(version:long,data:long,count:long,offset:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset);
 %}
 
 
@@ -333,8 +340,9 @@ function log_proc_read_done(version:long,data:long,count:long,status:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
 %}
 
 probe addevent.nfs.proc.read_done.return
@@ -370,8 +378,9 @@ function log_proc_write_done(version:long,data:long,count:long,status:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITEDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITEDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
 %}
 
 probe addevent.nfs.proc.write_done.return
@@ -407,8 +416,9 @@ function log_proc_commit_done(version:long,data:long,count:long,status:long)
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->status,THIS->count);
 %}
 
 probe addevent.nfs.proc.commit_done.return
@@ -444,8 +454,9 @@ function log_proc_open(version:long,inode:long,
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_OPEN_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_OPEN_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode);
 %}
 
 probe addevent.nfs.proc.open.return
@@ -481,8 +492,9 @@ function log_proc_release(version:long,inode:long,
 
 	getdevice(sb->s_id,&major_device,&minor_device);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RELEASE_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RELEASE_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode);
 %}
 
 probe addevent.nfs.proc.release.return
@@ -516,8 +528,9 @@ function log_proc_create(version:long,inode:long,filename:string,mode:long)
 	int major_device,minor_device;
 
 	getdevice(sb->s_id,&major_device,&minor_device);
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_CREATE_ENTRY,"%1b%1b%8b%1b%0s%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                             NFS_FILEID(inode),THIS->version,THIS->filename,THIS->mode);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_CREATE_ENTRY,"%1b%1b%8b%1b%0s%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->filename,THIS->mode);
 %}
 
 probe addevent.nfs.proc.create.return
@@ -552,8 +565,9 @@ function log_proc_remove(version:long,inode:long,
 	int major_device,minor_device;
 
 	getdevice(sb->s_id,&major_device,&minor_device);
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_REMOVE_ENTRY,"%1b%1b%8b%1b%0s%4b",(_FMT_)major_device,(_FMT_)minor_device,
-                                                       NFS_FILEID(inode),THIS->version,THIS->filename);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_REMOVE_ENTRY,"%1b%1b%8b%1b%0s%4b",
+		(_FMT_)major_device,(_FMT_)minor_device,
+		NFS_FILEID(inode),THIS->version,THIS->filename);
 %}
 
 probe addevent.nfs.proc.remove.return
@@ -592,9 +606,10 @@ function log_proc_rename(version:long,old_dir:long,old_name:string,
 	getdevice(old_sb->s_id,&major_old,&minor_old);
 	getdevice(new_sb->s_id,&major_new,&minor_new);
 	
-	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RENAME_ENTRY,"%1b%1b%1b%8b%0s%1b%1b%8b%0s",THIS->version,
-                                             (_FMT_)major_old,(_FMT_)minor_old,NFS_FILEID(old_dir),THIS->old_name,
-					     (_FMT_)major_new,(_FMT_)minor_new,NFS_FILEID(new_dir),THIS->new_name);
+	_lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RENAME_ENTRY,"%1b%1b%1b%8b%0s%1b%1b%8b%0s",
+		THIS->version,(_FMT_)major_old,(_FMT_)minor_old,NFS_FILEID(old_dir),
+		THIS->old_name,(_FMT_)major_new,(_FMT_)minor_new,NFS_FILEID(new_dir),
+		THIS->new_name);
 %}
 
 probe addevent.nfs.proc.rename.return