From 2a22df62a80d032e9450570c32009bfea4be7305 Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@redhat.com>
Date: Fri, 17 Apr 2009 10:15:41 -0400
Subject: [PATCH] Output probe calling sequence comment

* dtrace: Output probe calling sequence comment
---
 dtrace                                      | 16 +++-------------
 testsuite/systemtap.base/static_uprobes.exp |  1 -
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dtrace b/dtrace
index 114e70a67..a2b495b23 100755
--- a/dtrace
+++ b/dtrace
@@ -17,12 +17,11 @@ from subprocess import call
 from tempfile import mkstemp
 
 class provider:
-    arglist = dict()
     def open(self, provider, header):
         have_provider = False
         self.f = open(provider)
         self.h = open(header,mode='w')
-        self.h.write("// Generated by the Systemtap dtrace wrapper\n")
+        self.h.write("/* Generated by the Systemtap dtrace wrapper */\n")
         self.h.write("\n#include <sys/sdt.h>\n\n")
         in_comment = False
         while (True):
@@ -49,7 +48,6 @@ class provider:
                 new_args = ""
                 i = 0
                 c = 0
-                self.arglist[this_probe] = ""
                 while (i < len(args)):
                     if (args[i:i+1] == ","):
                         new_args = ('%s%s' % (new_args, args[i]))
@@ -57,8 +55,6 @@ class provider:
                     else:
                         new_args = new_args + args[i]
                     i += 1
-                if (len(new_args) > 0):
-                    self.arglist[this_probe] = ('%s arg%d' % (new_args, c))
                 if (len(new_args) == 0):
                     c = 0
                     stap_str = "STAP_PROBE(provider,%s" % (this_probe)
@@ -68,22 +64,16 @@ class provider:
                 define_str = "#define %s(" % (this_probe_canon)
                 i = 1
                 while (i <= c):
-                    if (i != 0):
+                    if (i != 1):
                         define_str += ","
                     define_str = define_str + "arg%s" % (i);
                     stap_str = stap_str + ",arg%s" % (i);
                     i += 1
+                self.h.write ('/* %s (%s) */\n' % (this_probe_canon,new_args))
                 self.h.write ('#define %s_ENABLED() 1\n' % this_probe_canon)
                 self.h.write (define_str + ") \\\n")
                 self.h.write (stap_str + ")\n\n")
 
-    def get(self, arg):
-        print arg
-        if (arg in self.arglist):
-            return self.arglist[arg]
-        else:
-            return ""
-
 def usage ():
     print "Usage " + sys.argv[0] + " [-h | -G] -s File.d -o File {Files}"
     sys.exit(1)
diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp
index 07ff83e94..1e53d5d38 100644
--- a/testsuite/systemtap.base/static_uprobes.exp
+++ b/testsuite/systemtap.base/static_uprobes.exp
@@ -93,7 +93,6 @@ if {[installtest_p]} {
 if {[catch {exec $dtrace -h -s $sup_dpath} res]} {
     verbose -log "unable to run $dtrace: $res"
 }
-catch {exec rm -f $sup_dpath}
 if {[file exists $sup_hpath]} then {
     pass "$test dtrace"
 } else {
-- 
2.43.5