2006-05-16 David Smith <dsmith@redhat.com>

	* conversions.stp (hexstring, string): Removed functions.  Because
	of parser changes, "string" is now a reserved word and cannot be a
	function name.  Use 'sprintf("0x%x", num)' to replace hexstring()
	and either 'sprint(num)' or 'sprintf("%d", num)' to replace
	string().

	* syscalls.stp (syscall.accept, syscall.alarm, syscall.close,
	syscall.dup, syscall.epoll_create, syscall.exit, syscall.fchdir,
	syscall.fdatasync, syscall.fsync, syscall.getsid) Changed
	'string()' calls to 'sprint()' calls.
	* syscalls2.stp (syscall.sched_get_priority_max,
	syscall.sched_get_priority_min, syscall.sched_getscheduler,
	syscall.setfsgid, syscall.setfsgid16, syscall.setfsuid,
	syscall.setfsuid16, syscall.setgid, syscall.setgid16,
	syscall.setuid, syscall.setuid16, syscall.ssetmask,
	syscall.timer_delete, syscall.timer_getoverrun): Ditto.
	* i686/syscalls.stp (syscall.iopl, syscall.rt_sigreturn,
	syscall.sigreturn): Ditto.
	* ppc64/syscalls.stp (syscall.ppc64_personality): Ditto.
	* x86_64/syscalls.stp (kernel.syscall.iopl, kernel.syscall.umask):
	Ditto.

	* test/ctostp.sh: Uses 'sprint()' instead of 'string()' in
	generated systemtap code.

8 files changed, 59 insertions, 40 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 14bafbd3..ffb035b8 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,30 @@
+2006-05-16  David Smith  <dsmith@redhat.com>
+
+	* conversions.stp (hexstring, string): Removed functions.  Because
+	of parser changes, "string" is now a reserved word and cannot be a
+	function name.  Use 'sprintf("0x%x", num)' to replace hexstring()
+	and either 'sprint(num)' or 'sprintf("%d", num)' to replace
+	string().
+
+	* syscalls.stp (syscall.accept, syscall.alarm, syscall.close,
+	syscall.dup, syscall.epoll_create, syscall.exit, syscall.fchdir,
+	syscall.fdatasync, syscall.fsync, syscall.getsid) Changed
+	'string()' calls to 'sprint()' calls.
+	* syscalls2.stp (syscall.sched_get_priority_max,
+	syscall.sched_get_priority_min, syscall.sched_getscheduler,
+	syscall.setfsgid, syscall.setfsgid16, syscall.setfsuid,
+	syscall.setfsuid16, syscall.setgid, syscall.setgid16,
+	syscall.setuid, syscall.setuid16, syscall.ssetmask,
+	syscall.timer_delete, syscall.timer_getoverrun): Ditto.
+	* i686/syscalls.stp (syscall.iopl, syscall.rt_sigreturn,
+	syscall.sigreturn): Ditto.
+	* ppc64/syscalls.stp (syscall.ppc64_personality): Ditto.
+	* x86_64/syscalls.stp (kernel.syscall.iopl, kernel.syscall.umask):
+	Ditto.
+
+	* test/ctostp.sh: Uses 'sprint()' instead of 'string()' in
+	generated systemtap code.
+
 2006-05-14  Martin Hunt  <hunt@redhat.com>
 
 	* aux_syscalls.stp (_sys_open_flag_str): Rewrite in C so it
diff --git a/tapset/conversions.stp b/tapset/conversions.stp
index 7a664a58..099cdd20 100644
--- a/tapset/conversions.stp
+++ b/tapset/conversions.stp
@@ -6,14 +6,6 @@
 // Public License (GPL); either version 2, or (at your option) any
 // later version.
 
-function hexstring:string (num:long) %{ /* pure */
-    snprintf (THIS->__retvalue, MAXSTRINGLEN, "0x%llx", (long long) THIS->num);
-%}
-
-function string:string (num:long) %{ /* pure */
-    snprintf (THIS->__retvalue, MAXSTRINGLEN, "%lld", (long long) THIS->num);
-%}
-
 function kernel_string:string (addr:long) %{ /* pure */
   char *destination = THIS->__retvalue;
   deref_string (destination, THIS->addr, MAXSTRINGLEN);
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index e8ab3e18..76f6b5a8 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -321,7 +321,7 @@ probe syscall.inotify_rm_watch.return =
 probe syscall.iopl = kernel.function("sys_iopl") {
 	name = "iopl"
 	level = $unused
-	argstr = string($unused)
+	argstr = sprint($unused)
 }
 probe syscall.iopl.return = kernel.function("sys_iopl").return {
 	name = "iopl"
@@ -428,7 +428,7 @@ probe syscall.olduname.return = kernel.function("sys_olduname").return {
 probe syscall.rt_sigreturn = kernel.function("sys_rt_sigreturn") {
 	name = "rt_sigreturn"
 	__unused = $__unused
-	argstr = string($__unused)
+	argstr = sprint($__unused)
 }
 probe syscall.rt_sigreturn.return =
 	kernel.function("sys_rt_sigreturn").return {
@@ -601,7 +601,7 @@ probe syscall.sigreturn =
 	kernel.function("sys_sigreturn") {
 	name = "sigreturn"
 	__unused = $__unused
-	argstr = string($__unused)
+	argstr = sprint($__unused)
 }
 probe syscall.sigreturn.return =
 	kernel.function("sys_sigreturn").return {
diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index 0a9d70f6..52b97c50 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -1796,7 +1796,7 @@ probe syscall.sys64_time.return = kernel.function("sys64_time").return {
 probe syscall.ppc64_personality = kernel.function("ppc64_personality") {
 	name = "ppc64_personality"
 	persona = $personality
-	argstr = string($personality)
+	argstr = sprint($personality)
 }
 probe syscall.ppc64_personality.return =
 	kernel.function("ppc64_personality").return {
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index c159c686..ddb39827 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -30,7 +30,7 @@ probe syscall.accept = kernel.function("sys_accept") {
 	s = $fd
 	addr_uaddr = $upeer_sockaddr
 	addrlen_uaddr = $upeer_addrlen
-	argstr = string(s)
+	argstr = sprint(s)
 }
 probe syscall.accept.return = kernel.function("sys_accept").return {
 	name = "accept"
@@ -85,7 +85,7 @@ probe syscall.adjtimex.return = kernel.function("sys_adjtimex").return {
 probe syscall.alarm = kernel.function("sys_alarm") {
 	name = "alarm"
 	seconds = $seconds
-	argstr = string($seconds)
+	argstr = sprint($seconds)
 }
 probe syscall.alarm.return = kernel.function("sys_alarm").return {
 	name = "alarm"
@@ -301,7 +301,7 @@ probe kernel.syscall.clock_settime.return =
 probe syscall.close = kernel.function("sys_close") {
 	name = "close"
 	fd = $fd
-	argstr = string(fd)
+	argstr = sprint(fd)
 }
 probe syscall.close.return = kernel.function("sys_close").return {
 	name = "close"
@@ -339,7 +339,7 @@ probe syscall.delete_module.return = kernel.function("sys_delete_module").return
 probe syscall.dup = kernel.function("sys_dup") {
 	name = "dup"
 	oldfd = $fildes
-	argstr = string($fildes)
+	argstr = sprint($fildes)
 }
 probe syscall.dup.return = kernel.function("sys_dup").return {
 	name = "dup"
@@ -364,7 +364,7 @@ probe syscall.dup2.return = kernel.function("sys_dup2").return {
 probe syscall.epoll_create = kernel.function("sys_epoll_create") {
 	name = "epoll_create"
 	size = $size
-	argstr = string($size)
+	argstr = sprint($size)
 }
 probe syscall.epoll_create.return = kernel.function("sys_epoll_create").return {
 	name = "epoll_create"
@@ -438,7 +438,7 @@ probe syscall.execve.return = kernel.function("do_execve").return {
 probe syscall.exit = kernel.function("do_exit") {
 	name = "exit"
 	status = $code
-	argstr = string($code)
+	argstr = sprint($code)
 }
 probe syscall.exit.return = end {}
 
@@ -501,7 +501,7 @@ probe kernel.syscall.fadvise64_64.return =
 probe syscall.fchdir = kernel.function("sys_fchdir") {
 	name = "fchdir"
 	fd = $fd
-	argstr = string($fd)
+	argstr = sprint($fd)
 }
 probe syscall.fchdir.return = kernel.function("sys_fchdir").return {
 	name = "fchdir"
@@ -574,7 +574,7 @@ probe kernel.syscall.fcntl.return =
 probe syscall.fdatasync = kernel.function("sys_fdatasync") {
 	name = "fdatasync"
 	fd = $fd
-	argstr = string(fd)
+	argstr = sprint(fd)
 }
 probe syscall.fdatasync.return = kernel.function("sys_fdatasync").return {
 	name = "fdatasync"
@@ -725,7 +725,7 @@ probe syscall.fstatfs64.return = kernel.function("sys_fstatfs64").return {
 probe syscall.fsync = kernel.function("sys_fsync") {
 	name = "fsync"
 	fd = $fd
-	argstr = string(fd)
+	argstr = sprint(fd)
 }
 probe syscall.fsync.return = kernel.function("sys_fsync").return {
 	name = "fsync.return"
@@ -1065,7 +1065,7 @@ probe syscall.getrusage.return = kernel.function("sys_getrusage").return {
 probe syscall.getsid = kernel.function("sys_getsid") {
 	name = "getsid"
 	pid = $pid
-	argstr = string(pid)
+	argstr = sprint(pid)
 }
 probe syscall.getsid.return = kernel.function("sys_getsid").return {
 	name = "getsid"
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 81cd62af..86e42796 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -848,7 +848,7 @@ probe syscall.sched_get_priority_max =
 	kernel.function("sys_sched_get_priority_max") {
 	name = "sched_get_priority_max"
 	policy = $policy
-	argstr = string(policy)
+	argstr = sprint(policy)
 }
 probe syscall.sched_get_priority_max.return =
 	kernel.function("sys_sched_get_priority_max").return {
@@ -864,7 +864,7 @@ probe syscall.sched_get_priority_min =
 	kernel.function("sys_sched_get_priority_min") {
 	name = "sched_get_priority_min"
 	policy = $policy
-	argstr = string(policy)
+	argstr = sprint(policy)
 }
 probe syscall.sched_get_priority_min.return =
 	kernel.function("sys_sched_get_priority_min").return {
@@ -879,7 +879,7 @@ probe syscall.sched_get_priority_min.return =
 probe syscall.sched_getscheduler = kernel.function("sys_sched_getscheduler") {
 	name = "sched_getscheduler"
 	pid = $pid
-	argstr = string(pid)
+	argstr = sprint(pid)
 }
 probe syscall.sched_getscheduler.return =
 	kernel.function("sys_sched_getscheduler").return {
@@ -1160,7 +1160,7 @@ probe syscall.setdomainname.return =
 probe syscall.setfsgid = kernel.function("sys_setfsgid") {
 	name = "setfsgid"
 	fsgid = $gid
-	argstr = string($gid)
+	argstr = sprint($gid)
 }
 probe syscall.setfsgid.return = kernel.function("sys_setfsgid").return {
 	name = "setfsgid"
@@ -1174,7 +1174,7 @@ probe syscall.setfsgid.return = kernel.function("sys_setfsgid").return {
 probe syscall.setfsgid16 = kernel.function("sys_setfsgid") {
 	name = "setfsgid16"
 	gid = $gid
-	argstr = string($gid)
+	argstr = sprint($gid)
 }
 probe syscall.setfsgid16.return = kernel.function("sys_setfsgid").return {
 	name = "setfsgid16"
@@ -1188,7 +1188,7 @@ probe syscall.setfsgid16.return = kernel.function("sys_setfsgid").return {
 probe syscall.setfsuid = kernel.function("sys_setfsuid") {
 	name = "setfsuid"
 	fsuid = $uid
-	argstr = string($uid)
+	argstr = sprint($uid)
 }
 probe syscall.setfsuid.return = kernel.function("sys_setfsuid").return {
 	name = "setfsuid"
@@ -1202,7 +1202,7 @@ probe syscall.setfsuid.return = kernel.function("sys_setfsuid").return {
 probe syscall.setfsuid16 = kernel.function("sys_setfsuid") {
 	name = "setfsuid16"
 	uid = $uid
-	argstr = string($uid)
+	argstr = sprint($uid)
 }
 probe syscall.setfsuid16.return = kernel.function("sys_setfsuid").return {
 	name = "setfsuid16"
@@ -1216,7 +1216,7 @@ probe syscall.setfsuid16.return = kernel.function("sys_setfsuid").return {
 probe syscall.setgid = kernel.function("sys_setgid") {
 	name = "setgid"
 	gid = $gid
-	argstr = string($gid)
+	argstr = sprint($gid)
 }
 probe syscall.setgid.return = kernel.function("sys_setgid").return {
 	name = "setgid"
@@ -1230,7 +1230,7 @@ probe syscall.setgid.return = kernel.function("sys_setgid").return {
 probe syscall.setgid16 = kernel.function("sys_setgid") {
 	name = "setgid16"
 	gid = $gid
-	argstr = string($gid)
+	argstr = sprint($gid)
 }
 probe syscall.setgid16.return = kernel.function("sys_setgid").return {
 	name = "setgid16"
@@ -1571,7 +1571,7 @@ probe syscall.settimeofday.return =
 probe syscall.setuid = kernel.function("sys_setuid") {
 	name = "setuid"
 	uid = $uid
-	argstr = string($uid)
+	argstr = sprint($uid)
 }
 probe syscall.setuid.return = kernel.function("sys_setuid").return {
 	name = "setuid"
@@ -1585,7 +1585,7 @@ probe syscall.setuid.return = kernel.function("sys_setuid").return {
 probe syscall.setuid16 = kernel.function("sys_setuid") {
 	name = "setuid16"
 	uid = $uid
-	argstr = string($uid)
+	argstr = sprint($uid)
 }
 probe syscall.setuid16.return = kernel.function("sys_setuid").return {
 	name = "setuid16"
@@ -1836,7 +1836,7 @@ probe syscall.socketpair.return = kernel.function("sys_socketpair").return {
 probe syscall.ssetmask = kernel.function("sys_ssetmask") {
 	name = "ssetmask"
 	newmask = $newmask
-	argstr = string($newmask)
+	argstr = sprint($newmask)
 }
 probe syscall.ssetmask.return = kernel.function("sys_ssetmask").return {
 	name = "ssetmask"
@@ -2085,7 +2085,7 @@ probe syscall.timer_create.return =
 probe syscall.timer_delete = kernel.function("sys_timer_delete") {
 	name = "timer_delete"
 	timerid = $timer_id
-	argstr = string($timer_id)
+	argstr = sprint($timer_id)
 }
 probe syscall.timer_delete.return = kernel.function("sys_timer_delete").return {
 	name = "timer_delete"
@@ -2099,7 +2099,7 @@ probe syscall.timer_delete.return = kernel.function("sys_timer_delete").return {
 probe syscall.timer_getoverrun = kernel.function("sys_timer_getoverrun") {
 	name = "timer_getoverrun"
 	timerid = $timer_id
-	argstr = string($timer_id)
+	argstr = sprint($timer_id)
 }
 probe syscall.timer_getoverrun.return =
 	kernel.function("sys_timer_getoverrun").return {
diff --git a/tapset/test/ctostp.sh b/tapset/test/ctostp.sh
index 1918ae83..132f204c 100755
--- a/tapset/test/ctostp.sh
+++ b/tapset/test/ctostp.sh
@@ -42,9 +42,9 @@ do
          var=` echo $line|cut -d"\"" -f4`
          if [ `echo $var|grep void|wc -l` -eq 1 ] 
          then
-            echo "      log(\"$func: $var = \".string(0))"    >> $dest/$fn.stp
+            echo "      log(\"$func: $var = \".sprint(0))"    >> $dest/$fn.stp
          else 
-            echo "      log(\"$func: $var = \".string($var))" >> $dest/$fn.stp
+            echo "      log(\"$func: $var = \".sprint($var))" >> $dest/$fn.stp
          fi
       fi
    done < $file
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index 0d8a73ee..b97ca7b0 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -242,7 +242,7 @@ probe kernel.syscall.get_mempolicy.return =
 probe kernel.syscall.iopl = kernel.function("sys_iopl") {
 	name = "iopl"
 	level = $level
-	argstr = string($level)	
+	argstr = sprint($level)	
 }
 probe kernel.syscall.iopl.return = kernel.function("sys_iopl").return {
 	name = "iopl"
@@ -412,7 +412,7 @@ probe kernel.syscall.umask = kernel.function("sys_umask") {
 	/*
 	 * doesnt like $mask on x86_64 ????
 	 */
-	argstr = string($mask)
+	argstr = sprint($mask)
 }
 probe kernel.syscall.umask.return = kernel.function("sys_umask").return {
 	name = "umask"