2007-08-15 Wenji Huang <wenji.huang@oracle.com>

      * aux_syscalls.stp(_reboot_flag_str,_futex_op_str,_mprotect_prot_str,
       _fcntl_cmd_str, _quotaclt_cmd_str, _sock_type_str, _rlimit_resource_str,
       _rusage_who_str): Add new entries, modify default return string."

2 files changed, 62 insertions, 37 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 0102599d..8fddebf4 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-15  Wenji Huang  <wenji.huang@oracle.com>
+
+        * aux_syscalls.stp(_reboot_flag_str,_futex_op_str,_mprotect_prot_str,
+	_fcntl_cmd_str, _quotaclt_cmd_str, _sock_type_str, _rlimit_resource_str,
+	_rusage_who_str): Add new entries, modify default return string.
+
 2007-08-15  Martin Hunt  <hunt@redhat.com>
 
 	* x86_64/syscalls.stp: Add support for sys32_mmap[2],
@@ -13,8 +19,8 @@
 
 2007-08-12  Wenji Huang  <wenji.huang@oracle.com>
 
-	* aux_syscalls.stp(_sched_policy_str,_nfsctl_cmd_str): Add SCHED_BATCH to policy entries,
-	NFSCTL_GETFD,NFSCTL_GETFS to nfsctl entries
+	* aux_syscalls.stp(_sched_policy_str,_nfsctl_cmd_str): Add SCHED_BATCH to
+	 policy entries, FSCTL_GETFD,NFSCTL_GETFS to nfsctl entries
 
 2007-08-10  Josh Stone  <joshua.i.stone@intel.com>
 
diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp
index 4450ff70..ec4cbabf 100644
--- a/tapset/aux_syscalls.stp
+++ b/tapset/aux_syscalls.stp
@@ -1132,21 +1132,21 @@ function _sched_policy_str(policy) {
    if(policy==1) return "SCHED_FIFO"
    if(policy==2) return "SCHED_RR"
    if(policy==3) return "SCHED_BATCH"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", policy)
 }
 
 function _priority_which_str(which) {
    if(which==0) return "PRIO_PROCESS"
    if(which==1) return "PRIO_PGRP"
    if(which==2) return "PRIO_USER"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", which)
 }
 
 function _shutdown_how_str(how) {
    if(how==0) return "SHUT_RD"
    if(how==1) return "SHUT_WR"
    if(how==2) return "SHUT_RDWR"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", how)
 }
 
 function _reboot_magic_str(magic) {
@@ -1155,7 +1155,7 @@ function _reboot_magic_str(magic) {
    if(magic==85072278)   return "LINUX_REBOOT_MAGIC2A"
    if(magic==369367448)  return "LINUX_REBOOT_MAGIC2B"
    if(magic==537993216)  return "LINUX_REBOOT_MAGIC2C"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", magic)
 }
 
 function _reboot_flag_str(flag) {
@@ -1165,14 +1165,16 @@ function _reboot_flag_str(flag) {
    if(flag==0xA1B2C3D4) return "LINUX_REBOOT_CMD_RESTART2"
    if(flag==0x89ABCDEF) return "LINUX_REBOOT_CMD_CAD_ON"
    if(flag==0x00000000) return "LINUX_REBOOT_CMD_CAD_OFF"
-   return ""
+   if(flag==0xD000FCE2) return "LINUX_REBOOT_CMD_SW_SUSPEND"
+   if(flag==0x45584543) return "LINUX_REBOOT_CMD_KEXEC"
+   return sprintf("UNKNOWN VALUE: %d", flag)
 }
 
 function _waitid_which_str(flag) {
    if(flag==0) return "P_ALL"
    if(flag==1) return "P_PID"
    if(flag==2) return "P_PGID"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", flag)
 }
 
 function _futex_op_str(op) {
@@ -1181,7 +1183,11 @@ function _futex_op_str(op) {
    if(op==2) return "FUTEX_FD"
    if(op==3) return "FUTEX_REQUEUE"
    if(op==4) return "FUTEX_CMP_REQUEUE"
-   return ""
+   if(op==5) return "FUTEX_WAKE_OP"
+   if(op==6) return "FUTEX_LOCK_PI"
+   if(op==7) return "FUTEX_UNLOCK_PI"
+   if(op==8) return "FUTEX_TRYLOCK_PI"
+   return sprintf("UNKNOWN VALUE: %d", op)
 }
 
 function _mountflags_str:string(op:long) 
@@ -1285,7 +1291,7 @@ function _statfs_f_type_str(f) {
    if(f==0x012FF7B4) return "XENIX_SUPER_MAGIC"
    if(f==0x58465342) return "XFS_SUPER_MAGIC"
    if(f==0x012FD16D) return "_XIAFS_SUPER_MAGIC"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", f)
 }
 
 function _mmap_flags(flags) {
@@ -1308,6 +1314,7 @@ function _mprotect_prot_str(prot) {
 		if(prot & 1) ps="PROT_READ|"
 		if(prot & 2) ps="PROT_WRITE|".ps
 		if(prot & 4) ps="PROT_EXEC|".ps
+		if(prot & 8) ps="PROT_SEM |".ps
 		return substr(ps,0,strlen(ps)-1)	
 	}
 	return "PROT_NONE"
@@ -1319,7 +1326,7 @@ function _madvice_advice_str(behavior) {
    if(behavior==0x00000002) return "MADV_SEQUENTIAL"
    if(behavior==0x00000003) return "MADV_WILLNEED"
    if(behavior==0x00000004) return "MADV_DONTNEED"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", behavior)
 }
 
 function _fadvice_advice_str(behavior) {
@@ -1328,32 +1335,33 @@ function _fadvice_advice_str(behavior) {
    if(behavior==0x00000002) return "FADV_SEQUENTIAL"
    if(behavior==0x00000003) return "FADV_WILLNEED"
    if(behavior==0x00000004) return "FADV_DONTNEED"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", behavior)
 }
 
 function _fcntl_cmd_str(cmd) {
-   if(cmd==0x00000000) return "F_DUPFD"
-   if(cmd==0x00000001) return "F_GETFD"
-   if(cmd==0x00000002) return "F_SETFD"
-   if(cmd==0x00000003) return "F_GETFL"
-   if(cmd==0x00000004) return "F_SETFL"
-   if(cmd==0x00000005) return "F_GETLK"
-   if(cmd==0x00000006) return "F_SETLK"
-   if(cmd==0x00000007) return "F_SETLKW"
-   if(cmd==0x00000008) return "F_SETOWN"
-   if(cmd==0x00000009) return "F_GETOWN"
-   if(cmd==0x0000000A) return "F_SETSIG"
-   if(cmd==0x0000000B) return "F_GETLK64"
-   if(cmd==0x0000000C) return "F_SETLK64"
-   if(cmd==0x0000000D) return "F_SETLKW64"
-   return ""
+   if(cmd==0) return "F_DUPFD"
+   if(cmd==1) return "F_GETFD"
+   if(cmd==2) return "F_SETFD"
+   if(cmd==3) return "F_GETFL"
+   if(cmd==4) return "F_SETFL"
+   if(cmd==5) return "F_GETLK"
+   if(cmd==6) return "F_SETLK"
+   if(cmd==7) return "F_SETLKW"
+   if(cmd==8) return "F_SETOWN"
+   if(cmd==9) return "F_GETOWN"
+   if(cmd==10) return "F_SETSIG"
+   if(cmd==11) return "F_GETSIG"
+   if(cmd==12) return "F_GETLK64"
+   if(cmd==13) return "F_SETLK64"
+   if(cmd==14) return "F_SETLKW64"
+   return sprintf("UNKNOWN VALUE: %d", cmd)
 }
 
 function _seek_whence_str(w) {
    if(w==0x00000000) return "SEEK_SET"
    if(w==0x00000001) return "SEEK_CUR"
    if(w==0x00000002) return "SEEK_END"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", w)
 }
 
 function _quotactl_cmd_str(cmd) {
@@ -1372,7 +1380,8 @@ function _quotactl_cmd_str(cmd) {
    if(cmd==0x5804) return "Q_XSETQLIM"
    if(cmd==0x5805) return "Q_XGETQSTAT"
    if(cmd==0x5806) return "Q_XQUOTARM"
-   return ""
+   if(cmd==0x5807) return "Q_XQUOTASYNC"
+   return sprintf("UNKNOWN VALUE: %d", cmd)
 }
 
 /* see sys/socket.h (for setsockopt) */
@@ -1400,7 +1409,7 @@ function _sockopt_optname_str(opt) {
    if(opt==21) return "SO_SNDTIMEO"
    if(opt==32) return "SO_SNDBUFFORCE"
    if(opt==33) return "SO_RCVBUFFORCE"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", opt)
 }
 
 /* `man 2 setsockopt` for more information */
@@ -1534,7 +1543,7 @@ function _sockopt_level_str(l) {
    if(l==131) return "PIPE"
    if(l==132) return "SCTP"
    if(l==133) return "FC"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", l)
 }
 
 function _sock_family_str(f) {
@@ -1567,7 +1576,7 @@ function _sock_family_str(f) {
    if(f==26) return "PF_LLC"
    if(f==31) return "PF_BLUETOOTH"
    if(f==32) return "PF_MAX"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", f)
 }
 
 function _sock_type_str(t) {
@@ -1576,15 +1585,16 @@ function _sock_type_str(t) {
    if(t==5) return "SOCK_SEQPACKET"
    if(t==3) return "SOCK_RAW"
    if(t==4) return "SOCK_RDM"
+   if(t==6) return "SOCK_DCCP"
    if(t==10) return "SOCK_PACKET"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", t)
 }
 
 function _opoll_op_str(o) {
    if(o==1) return "EPOLL_CTL_ADD"
    if(o==3) return "EPOLL_CTL_MOD"
    if(o==2) return "EPOLL_CTL_DEL"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", o)
 }
 
 function _epoll_events_str(e) {
@@ -1595,7 +1605,7 @@ function _epoll_events_str(e) {
    if(e==16) return "EPOLLHUP"
    if(e==-2147483648) return "EPOLLET"
    if(e==1073741824) return "EPOLLONESHOT"
-   return ""
+   return sprintf("UNKNOWN VALUE: %d", e)
 }
 
 function _rlimit_resource_str(r) {
@@ -1611,13 +1621,22 @@ function _rlimit_resource_str(r) {
    if(r==6) return "RLIMIT_NPROC"
    if(r==5) return "RLIMIT_RSS"
    if(r==3) return "RLIMIT_STACK"
-   return ""
+%( kernel_v >= "2.6.8" %?
+   if(r==11) return "RLIMIT_SIGPENDING"
+   if(r==12) return "RLIMIT_MSGQUEUE"
+%)
+%( kernel_v >= "2.6.12" %?
+   if(r==13) return "RLIMIT_NICE"
+   if(r==14) return "RLIMIT_RTPRIO"
+%)
+   return sprintf("UNKNOWN VALUE: %d", r)
 }
 
 function _rusage_who_str(w) {
    if(w==0) return "RUSAGE_SELF"
    if(w==-1) return "RUSAGE_CHILDREN"
-   return ""
+   if(w==-2) return "RUSAGE_BOTH"
+   return sprintf("UNKNOWN VALUE: %d", w)
 }
 
 /* for accessing 16-bit values encoded in a long */