2006-05-26 Martin Hunt <hunt@redhat.com>

	* errno.stp: Add octal option for returnstr.

	* [i686,x86_64]/syscalls.stp (umask): Print args and return
	in octal.
	(add_key): Comment out. This syscall is added by a xen patch
	and may not be present.
	(tux): Ditto.

	* syscalls.stp (accept): Fix arg name.

5 files changed, 63 insertions, 48 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index dfc586f1..fb25fd77 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-26  Martin Hunt  <hunt@redhat.com>
+
+	* errno.stp: Add octal option for returnstr.
+
+	* [i686,x86_64]/syscalls.stp (umask): Print args and return
+	in octal.
+	(add_key): Comment out. This syscall is added by a xen patch
+	and may not be present.
+	(tux): Ditto.
+	
+	* syscalls.stp (accept): Fix arg name.
+
 2006-05-25  Martin Hunt  <hunt@redhat.com>
 
 	* syscalls.stp: Add sys_fcntl and sys_listen.
diff --git a/tapset/errno.stp b/tapset/errno.stp
index 70625d1c..f97b6bd0 100644
--- a/tapset/errno.stp
+++ b/tapset/errno.stp
@@ -378,6 +378,8 @@ function returnstr:string (returnp:long) %{ /* pure */
 		snprintf (THIS->__retvalue, MAXSTRINGLEN, "%ld (%s)", ret, errlist[-ret]);
 	else if (THIS->returnp == 2)
 		snprintf (THIS->__retvalue, MAXSTRINGLEN, "0x%lx", ret);
-	else
+	else if (THIS->returnp == 3)
+		snprintf (THIS->__retvalue, MAXSTRINGLEN, "%#lo", ret);
+	else 	
 		snprintf (THIS->__retvalue, MAXSTRINGLEN, "%ld", ret);
 %}
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index a14b3923..fa64a291 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -152,19 +152,19 @@ probe syscall.acct.return = kernel.function("sys_acct").return {
 #             const void __user *_payload,
 #             size_t plen,
 #             key_serial_t ringid)
-probe syscall.add_key = kernel.function("sys_add_key") {
-	name = "add_key"
-	type_uaddr = $_type
-	description_auddr = $_description
-	payload_uaddr = $_payload
-	plen = $plen
-	ringid = $ringid
-	argstr = "add_key"
-}
-probe syscall.add_key.return = kernel.function("sys_add_key").return {
-	name = "add_key"
-	retstr = returnstr(1)
-}
+#probe syscall.add_key = kernel.function("sys_add_key") {
+#	name = "add_key"
+#	type_uaddr = $_type
+#	description_auddr = $_description
+#	payload_uaddr = $_payload
+#	plen = $plen
+#	ringid = $ringid
+#	argstr = "add_key"
+#}
+#probe syscall.add_key.return = kernel.function("sys_add_key").return {
+#	name = "add_key"
+#	retstr = returnstr(1)
+#}
 
 # quotactl ___________________________________________________
 #
@@ -652,12 +652,12 @@ probe syscall.stat64.return = kernel.function("sys_stat64").return {
 probe syscall.umask = kernel.function("sys_umask") {
 	name = "umask"
 	mask = $mask
-	argstr = sprintf("%d", $mask)
+	argstr = sprintf("%#o", $mask)
 }
 probe syscall.umask.return =
 	kernel.function("sys_umask").return {
 	name = "umask"
-	retstr = returnstr(1)
+	retstr = returnstr(3)
 }
 # vm86 _______________________________________________________
 /*
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 9db73182..f1ce9322 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -27,10 +27,10 @@
 #                 int __user *upeer_addrlen)
 probe syscall.accept = kernel.function("sys_accept") {
 	name = "accept"
-	s = $fd
+	sockfd = $fd
 	addr_uaddr = $upeer_sockaddr
 	addrlen_uaddr = $upeer_addrlen
-	argstr = sprint(s)
+	argstr = sprintf("%d, %p, %p", $fd, $upeer_sockaddr, $upeer_addrlen)
 }
 probe syscall.accept.return = kernel.function("sys_accept").return {
 	name = "accept"
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index c177c33c..7bc83645 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -131,19 +131,19 @@ probe syscall.acct.return = kernel.function("sys_acct").return {
 #             const void __user *_payload,
 #             size_t plen,
 #             key_serial_t ringid)
-probe syscall.add_key = kernel.function("sys_add_key") {
-	name = "add_key"
-	type_uaddr = $_type
-	description_auddr = $_description
-	payload_uaddr = $_payload
-	plen = $plen
-	ringid = $ringid
-	argstr = "add_key"
-}
-probe syscall.add_key.return = kernel.function("sys_add_key").return {
-	name = "add_key"
-	retstr = returnstr(1)
-}
+#probe syscall.add_key = kernel.function("sys_add_key") {
+#	name = "add_key"
+#	type_uaddr = $_type
+#	description_auddr = $_description
+#	payload_uaddr = $_payload
+#	plen = $plen
+#	ringid = $ringid
+#	argstr = "add_key"
+#}
+#probe syscall.add_key.return = kernel.function("sys_add_key").return {
+#	name = "add_key"
+#	retstr = returnstr(1)
+#}
 
 # quotactl ___________________________________________________
 #
@@ -392,29 +392,30 @@ probe kernel.syscall.time64.return = kernel.function("sys_time64").return {
  * sys_tux (unsigned int action,
  *          user_req_t *u_info)
  */
-probe kernel.syscall.tux = kernel.function("sys_tux") {
-	name = "tux"
-	action = $action
-	u_info_uaddr = $u_info
-	argstr = sprintf("%d, [%p]", $action, u_info_uaddr)
-}
-probe kernel.syscall.tux.return = kernel.function("sys_tux").return {
-	name = "tux"
-	retstr = returnstr(1)
-}
+#probe kernel.syscall.tux = kernel.function("sys_tux") {
+#	name = "tux"
+#	action = $action
+#	u_info_uaddr = $u_info
+#	argstr = sprintf("%d, [%p]", $action, u_info_uaddr)
+#}
+#probe kernel.syscall.tux.return = kernel.function("sys_tux").return {
+#	name = "tux"
+#	retstr = returnstr(1)
+#}
+
 # umask ______________________________________________________
 /*
  * asmlinkage long
  * sys_umask(int mask)
  */
-probe kernel.syscall.umask = kernel.function("sys_umask") {
+probe syscall.umask = kernel.function("sys_umask") {
 	name = "umask"
-	/*
-	 * doesnt like $mask on x86_64 ????
-	 */
-	argstr = sprint($mask)
+	mask = $mask
+	argstr = sprintf("%#o", $mask)
 }
-probe kernel.syscall.umask.return = kernel.function("sys_umask").return {
+probe syscall.umask.return =
+	kernel.function("sys_umask").return {
 	name = "umask"
-	retstr = returnstr(1)
+	retstr = returnstr(3)
 }
+