Allow the same static user probe to be used multiple times per line.

	* dtrace (provider): Add STAP_PROBE10.
	* includes/sys/sdt.h: Likewise.  Convert labels to __label__

1 files changed, 9 insertions, 0 deletions

diff --git a/dtrace b/dtrace
index d6d5ce21..7966e1f2 100755
--- a/dtrace
+++ b/dtrace
@@ -73,6 +73,15 @@ class provider:
                     self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5)\n' % (this_probe_canon, c+1, this_probe))
                 elif (c == 5):
                     self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6)\n' % (this_probe_canon, c+1, this_probe))
+                elif (c == 6):
+                    self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7)\n' % (this_probe_canon, c+1, this_probe))
+                elif (c == 7):
+                    self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)\n' % (this_probe_canon, c+1, this_probe))
+                elif (c == 8):
+                    self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)\n' % (this_probe_canon, c+1, this_probe))
+                elif (c == 9):
+                    self.h.write('// X %d %s\n' % (c+1,this_probe_canon))
+                    self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10)\n' % (this_probe_canon, c+1, this_probe))
                 self.h.write ('#define %s_ENABLED() 1\n' % this_probe_canon)
 
     def get(self, arg):