From ec80b3969d33e4d54e97ead4286bdb018e2f1f97 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 11 Mar 2009 22:11:09 -0400
Subject: improve sdt.h compatibility and test suite

Replaced cpp VA_ARGS in sdt.h with explicit enumeration of arguments
(since with -pedantic, cpp has no varargs), and added a few more
cflags variants to the sdt.exp test case.
---
 testsuite/systemtap.base/sdt.c   |  2 ++
 testsuite/systemtap.base/sdt.exp | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.c b/testsuite/systemtap.base/sdt.c
index 46f68664..7c7398e5 100644
--- a/testsuite/systemtap.base/sdt.c
+++ b/testsuite/systemtap.base/sdt.c
@@ -65,5 +65,7 @@ main (int argc, char **argv)
   call8(a, b, c, d, e, f, g, h);
   call9(a, b, c, d, e, f, g, h, i);
   call10(a, b, c, d, e, f, g, h, i, j);
+  (void) argv;
+  (void) argc;
   return 0;
 }
diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index 09aaaf8d..74818beb 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -10,31 +10,33 @@ set ::result_string {1
 1 2 3 4 5 6 7 8 9
 1 2 3 4 5 6 7 8 9 10}
 
-set extra_flags {{""} {additional_flags=-ansi}}
+set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic}}
 
 # Iterate extra_flags, trying each with C and C++
 for {set i 0} {$i < [llength $extra_flags]} {incr i} {
+set extra_flag [lindex $extra_flags $i]
+
 # C
 set test_flags "additional_flags=-g"
 set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
-set test_flags "$test_flags additional_flags=-std=gnu89"
 set test_flags "$test_flags additional_flags=-Wall"
-set test_flags "$test_flags additional_flags=-Wdeclaration-after-statement"
+set test_flags "$test_flags additional_flags=-Wextra"
 set test_flags "$test_flags additional_flags=-Werror"
 
-set res [target_compile $srcdir/$subdir/$test.c $test.prog executable [concat $test_flags " " [lindex $extra_flags $i]]]
+set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
-    fail "compiling $test.c"
+    fail "compiling $test.c $extra_flag"
     return
 } else {
-    pass "compiling $test.c"
+    pass "compiling $test.c $extra_flag"
 }
 
 if {[installtest_p]} {
+# XXX: we need distinct test names for these 
   stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog
 } else {
-  untested "$test"
+  untested "$test $extra_flag"
 }
 
 # C++
@@ -44,19 +46,20 @@ set test_flags "$test_flags additional_flags=-Wall"
 set test_flags "$test_flags additional_flags=-Werror"
 set test_flags "$test_flags additional_flags=-x additional_flags=c++"
 
-set res [target_compile $srcdir/$subdir/$test.c $test.prog executable [concat $test_flags [lindex $extra_flags $i]]]
+set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
-    fail "compiling $test.c"
+    fail "compiling $test.c c++ $extra_flag"
     return
 } else {
-    pass "compiling $test.c"
+    pass "compiling $test.c c++ $extra_flag"
 }
 
 if {[installtest_p]} {
+# XXX: we need distinct test names for these 
   stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog
 } else {
-  untested "$test"
+  untested "$test c++ $extra_flag"
 }
 }
 
-- 
cgit 


From 49462d1bcec68365e3ac96fc5c11c83ab7a8abd6 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 11 Mar 2009 20:07:07 -0700
Subject: Add simple testcases for @cast

---
 testsuite/systemtap.base/cast.exp |  4 ++++
 testsuite/systemtap.base/cast.stp | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 testsuite/systemtap.base/cast.exp
 create mode 100644 testsuite/systemtap.base/cast.stp

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/cast.exp b/testsuite/systemtap.base/cast.exp
new file mode 100644
index 00000000..df3246e8
--- /dev/null
+++ b/testsuite/systemtap.base/cast.exp
@@ -0,0 +1,4 @@
+set test "cast"
+set ::result_string {PID OK
+execname OK}
+stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.base/cast.stp b/testsuite/systemtap.base/cast.stp
new file mode 100644
index 00000000..bec0cc9b
--- /dev/null
+++ b/testsuite/systemtap.base/cast.stp
@@ -0,0 +1,22 @@
+probe begin
+{
+    curr = task_current()
+
+    // Compare PIDs
+    pid = pid()
+    cast_pid = @cast(curr, "task_struct")->tgid
+    if (pid == cast_pid)
+        println("PID OK")
+    else
+        printf("PID %d != %d\n", pid, cast_pid)
+
+    // Compare execnames
+    name = execname()
+    cast_name = kernel_string(@cast(curr, "task_struct")->comm)
+    if (name == cast_name)
+        println("execname OK")
+    else
+        printf("execname \"%s\" != \"%s\"\n", name, cast_name)
+
+    exit()
+}
-- 
cgit 


From 6769e48794cfbeda3957f691077fb9d65f3e87bc Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 11 Mar 2009 20:30:58 -0700
Subject: Add test to compile and run all tracepoints

This checks that kernel.trace("*") will compile, with all context
variables accessed as well.  For kernels without tracepoints, it will
just hit a "begin" and quit.

This doesn't ensure that kernel.trace("*") will always find something
when it should, though...
---
 testsuite/systemtap.base/tracepoints.exp |  3 +++
 testsuite/systemtap.base/tracepoints.stp | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 testsuite/systemtap.base/tracepoints.exp
 create mode 100644 testsuite/systemtap.base/tracepoints.stp

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/tracepoints.exp b/testsuite/systemtap.base/tracepoints.exp
new file mode 100644
index 00000000..bea461c4
--- /dev/null
+++ b/testsuite/systemtap.base/tracepoints.exp
@@ -0,0 +1,3 @@
+set test "tracepoints"
+set ::result_string {tracepoints OK}
+stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.base/tracepoints.stp b/testsuite/systemtap.base/tracepoints.stp
new file mode 100644
index 00000000..bdb4d730
--- /dev/null
+++ b/testsuite/systemtap.base/tracepoints.stp
@@ -0,0 +1,23 @@
+// This checks that we can compile and register every tracepoint
+// we can find, along with all of their context variables.
+global hits
+probe all_tracepoints = kernel.trace("*")
+{
+    if ($$name . $$vars . $$parms == "")
+        next
+
+    // Allow it to quit once we hit our hundredth tracepoint
+    if (++hits < 100)
+        next
+}
+
+// If there aren't any tracepoints in the kernel,
+// we use "begin" instead to quit right away.
+probe all_tracepoints!, begin {
+    println("tracepoints OK")
+    exit()
+}
+
+// give hits a use so there's no warning
+// when we don't have tracepoints
+probe never { hits++ }
-- 
cgit 


From fafd79e3a65854c8e7b3c0048e044af9741a0fff Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Fri, 13 Mar 2009 14:44:54 +0100
Subject: Introduce stap_run3 for distinct test names.

* testsuite/lib/stap_run2.exp: Add stap_run3, called from stap_run2.
* testsuite/systemtap.base/sdt.exp: Use stap_run3, for distinct test names.
---
 testsuite/systemtap.base/sdt.exp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index 74818beb..9e5dfc37 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -33,8 +33,7 @@ if { $res != "" } {
 }
 
 if {[installtest_p]} {
-# XXX: we need distinct test names for these 
-  stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog
+  stap_run3 "$test $extra_flag" $srcdir/$subdir/$test.stp -c ./$test.prog
 } else {
   untested "$test $extra_flag"
 }
@@ -56,8 +55,7 @@ if { $res != "" } {
 }
 
 if {[installtest_p]} {
-# XXX: we need distinct test names for these 
-  stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog
+  stap_run3 "$test c++ $extra_flag" $srcdir/$subdir/$test.stp -c ./$test.prog
 } else {
   untested "$test c++ $extra_flag"
 }
-- 
cgit 


From b16858f1452b4f111beb80875a5967dc8dff30fe Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Fri, 13 Mar 2009 14:49:55 +0100
Subject: Add -O2 and -O3 as extra test flags to sdt.

* testsuite/systemtap.base/sdt.exp: Add -O2, -O3.
---
 testsuite/systemtap.base/sdt.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index 9e5dfc37..a0220202 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -10,7 +10,7 @@ set ::result_string {1
 1 2 3 4 5 6 7 8 9
 1 2 3 4 5 6 7 8 9 10}
 
-set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic}}
+set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic} {additional_flags=-O2} {additional_flags="-O3"}}
 
 # Iterate extra_flags, trying each with C and C++
 for {set i 0} {$i < [llength $extra_flags]} {incr i} {
-- 
cgit 


From 2497c78e8aa704366683dad56fc8d749a5e92f52 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Fri, 13 Mar 2009 14:54:26 +0100
Subject: Add -ansi -pedantic pair to sdt test.

* testsuite/systemtap.base/sdt.exp: Add additional_flags -ansi together
  with -pedantic.
---
 testsuite/systemtap.base/sdt.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index a0220202..21b94810 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -10,7 +10,7 @@ set ::result_string {1
 1 2 3 4 5 6 7 8 9
 1 2 3 4 5 6 7 8 9 10}
 
-set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic} {additional_flags=-O2} {additional_flags="-O3"}}
+set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic} {additional_flags=-ansi additional_flags=-pedantic} {additional_flags=-O2} {additional_flags="-O3"}}
 
 # Iterate extra_flags, trying each with C and C++
 for {set i 0} {$i < [llength $extra_flags]} {incr i} {
-- 
cgit 


From 67aada05e69728327de1c7b8aeeaa0193668bed8 Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@redhat.com>
Date: Tue, 17 Mar 2009 11:38:08 -0400
Subject: Improve static_uprobes.exp

* systemtap.base/static_uprobes.exp: Compile with -x c++.  Test .probes absence.
---
 testsuite/systemtap.base/static_uprobes.exp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp
index a4bd5e2c..b4214436 100644
--- a/testsuite/systemtap.base/static_uprobes.exp
+++ b/testsuite/systemtap.base/static_uprobes.exp
@@ -1,5 +1,4 @@
-
-set test "sduprobes"
+set test "static_uprobes"
 
 # Compile a C program to use as the user-space probing target
 set sup_srcpath "[pwd]/static_uprobes.c"
@@ -115,9 +114,7 @@ if { $res != "" } {
     pass "$test compiling C -g"
 }
 
-spawn mv $sup_srcpath "[pwd]/static_uprobes.cc"
-set sup_srcpath "[pwd]/static_uprobes.cc"
-set sup_flags "$sup_flags c++"
+set sup_flags "$sup_flags additional_flags=-x additional_flags=c++"
 set res [target_compile $sup_srcpath $supcplus_exepath executable $sup_flags]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
@@ -163,9 +160,9 @@ if {$ok == 5} { pass "$test C" } { fail "$test C ($ok)" }
 
 set ok 0
 
-# spawn objcopy -R .probes $supcplus_exepath $sup_exepath 
-verbose -log "cp $supcplus_exepath $sup_exepath"
-spawn cp $supcplus_exepath $sup_exepath
+# Test setting a probe without .probes using only dwarf label info
+verbose -log "objcopy -R .probes $supcplus_exepath $sup_exepath"
+spawn objcopy -R .probes $supcplus_exepath $sup_exepath 
 verbose -log "spawn stap -c $sup_exepath $sup_stppath"
 spawn stap -c $sup_exepath $sup_stppath
 expect {
@@ -182,7 +179,4 @@ wait
 
 if {$ok == 5} { pass "$test C++" } { fail "$test C++ ($ok)" }
 
-# catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_hpath $sup_stppath}
-
-# It's not so important to clean up, and it's unhelpful if
-# one needs to diagnose a test failure.
+catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_dpath $sup_hpath $sup_stppath}
-- 
cgit 


From 0afb7073fa08980ecf9a80018d18a5148c2f686e Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 19 Mar 2009 11:32:48 -0400
Subject: rename process().itrace -> process().insn introduce
 process().insn.block

---
 testsuite/systemtap.base/itrace.exp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/itrace.exp b/testsuite/systemtap.base/itrace.exp
index f19af977..e215bfe7 100644
--- a/testsuite/systemtap.base/itrace.exp
+++ b/testsuite/systemtap.base/itrace.exp
@@ -1,8 +1,5 @@
 # itrace test
 
-# temporarily disabled
-return
-
 
 # Initialize variables
 set utrace_support_found 0
@@ -11,7 +8,7 @@ set exepath "[pwd]/ls_[pid]"
 set itrace1_script {
     global instrs = 0
     probe begin { printf("systemtap starting probe\n") }
-    probe process("%s").itrace
+    probe process("%s").insn
     {
         instrs += 1
 	if (instrs == 5)
@@ -28,7 +25,7 @@ set itrace1_script_output "itraced = 5\r\n"
 set itrace2_script {
     global instrs = 0, itrace_on = 0, start_timer = 0
     probe begin { start_timer = 1; printf("systemtap starting probe\n") }
-    probe process("%s").itrace if (itrace_on)
+    probe process("%s").insn if (itrace_on)
     {
         instrs += 1
 	if (instrs == 5)
-- 
cgit 


From 422735b3ec857e812097566e28950aa3313892b4 Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@redhat.com>
Date: Fri, 20 Mar 2009 16:30:19 -0400
Subject: Define static user probe point using asm instead of c.

* includes/sys/sdt.h (STAP_PROBE_DATA): New.  Define the probe point
using asm instead of c.
(STAP_PROBEN): Use it.
* testsuite/systemtap.base/sdt.exp: Continue if a compile fails.
* testsuite/systemtap.base/static_uprobes.exp: Don't test setting
probe without .probes section.
---
 testsuite/systemtap.base/sdt.exp            |  6 ++++--
 testsuite/systemtap.base/static_uprobes.exp | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index 21b94810..a398d795 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -27,7 +27,8 @@ set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_fla
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
     fail "compiling $test.c $extra_flag"
-    return
+    untested "$test $extra_flag"
+    continue
 } else {
     pass "compiling $test.c $extra_flag"
 }
@@ -49,7 +50,8 @@ set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_fla
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
     fail "compiling $test.c c++ $extra_flag"
-    return
+    untested "$test $extra_flag"
+    continue
 } else {
     pass "compiling $test.c c++ $extra_flag"
 }
diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp
index b4214436..e407440e 100644
--- a/testsuite/systemtap.base/static_uprobes.exp
+++ b/testsuite/systemtap.base/static_uprobes.exp
@@ -103,7 +103,11 @@ if {[installtest_p]} {
     set sdtdir $srcdir/../includes
 }
 
-set sup_flags "additional_flags=-I$sdtdir additional_flags=-g additional_flags=-O additional_flags=-I."
+set sup_flags "additional_flags=-I$srcdir/../includes/sys"
+set sup_flags "$sup_flags additional_flags=-I$sdtdir"
+set sup_flags "$sup_flags additional_flags=-g"
+set sup_flags "$sup_flags  additional_flags=-O"
+set sup_flags "$sup_flags  additional_flags=-I."
 set res [target_compile $sup_srcpath $sup_exepath executable $sup_flags]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
@@ -177,6 +181,10 @@ expect {
 
 wait
 
-if {$ok == 5} { pass "$test C++" } { fail "$test C++ ($ok)" }
+# we now generate the probes via asm so there is no label debug info
+if {$ok == 5} { pass "$test C++" } { xfail "$test C++ ($ok)" }
 
+if { $verbose == 0 } {
 catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_dpath $sup_hpath $sup_stppath}
+}
+
-- 
cgit 


From a99eea4f68db917268b83ab75574c832b646bd65 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Sat, 21 Mar 2009 08:39:57 -0400
Subject: sdt.exp: save intermediate sdt.h-client executables for analysis

* testsuite/lib/stap_run2.exp (stap_run3): Put supplied stap
  extra arguments after the .stp script name, not before, so
  that @1/such arguments can be substituted within.
---
 testsuite/systemtap.base/sdt.exp | 14 +++++++++-----
 testsuite/systemtap.base/sdt.stp | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index a398d795..46fa5a28 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -15,6 +15,7 @@ set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {ad
 # Iterate extra_flags, trying each with C and C++
 for {set i 0} {$i < [llength $extra_flags]} {incr i} {
 set extra_flag [lindex $extra_flags $i]
+set testprog "sdt.c.exe.$i"
 
 # C
 set test_flags "additional_flags=-g"
@@ -23,7 +24,9 @@ set test_flags "$test_flags additional_flags=-Wall"
 set test_flags "$test_flags additional_flags=-Wextra"
 set test_flags "$test_flags additional_flags=-Werror"
 
-set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"]
+set saveidx 0
+
+set res [target_compile $srcdir/$subdir/$test.c $testprog executable "$test_flags $extra_flag"]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
     fail "compiling $test.c $extra_flag"
@@ -34,19 +37,21 @@ if { $res != "" } {
 }
 
 if {[installtest_p]} {
-  stap_run3 "$test $extra_flag" $srcdir/$subdir/$test.stp -c ./$test.prog
+  stap_run3 "$test $extra_flag" $srcdir/$subdir/$test.stp $testprog -c ./$testprog
 } else {
   untested "$test $extra_flag"
 }
 
 # C++
+set testprog "sdt.cxx.exe.$i"
+
 set test_flags "additional_flags=-g"
 set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys"
 set test_flags "$test_flags additional_flags=-Wall"
 set test_flags "$test_flags additional_flags=-Werror"
 set test_flags "$test_flags additional_flags=-x additional_flags=c++"
 
-set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"]
+set res [target_compile $srcdir/$subdir/$test.c $testprog executable "$test_flags $extra_flag"]
 if { $res != "" } {
     verbose "target_compile failed: $res" 2
     fail "compiling $test.c c++ $extra_flag"
@@ -57,10 +62,9 @@ if { $res != "" } {
 }
 
 if {[installtest_p]} {
-  stap_run3 "$test c++ $extra_flag" $srcdir/$subdir/$test.stp -c ./$test.prog
+  stap_run3 "$test c++ $extra_flag" $srcdir/$subdir/$test.stp $testprog -c ./$testprog
 } else {
   untested "$test c++ $extra_flag"
 }
 }
 
-catch {exec rm -f $test.prog}
diff --git a/testsuite/systemtap.base/sdt.stp b/testsuite/systemtap.base/sdt.stp
index 1f075bca..5df1fdc9 100644
--- a/testsuite/systemtap.base/sdt.stp
+++ b/testsuite/systemtap.base/sdt.stp
@@ -1,49 +1,49 @@
-probe process("sdt.prog").mark("mark_a")
+probe process(@1).mark("mark_a")
 {
   printf("%d\n", $arg1);
 }
 
-probe process("sdt.prog").mark("mark_b")
+probe process(@1).mark("mark_b")
 {
   printf("%d %d\n", $arg1, $arg2);
 }
 
-probe process("sdt.prog").mark("mark_c")
+probe process(@1).mark("mark_c")
 {
   printf("%d %d %d\n", $arg1, $arg2, $arg3);
 }
 
-probe process("sdt.prog").mark("mark_d")
+probe process(@1).mark("mark_d")
 {
   printf("%d %d %d %d\n", $arg1, $arg2, $arg3, $arg4);
 }
 
-probe process("sdt.prog").mark("mark_e")
+probe process(@1).mark("mark_e")
 {
   printf("%d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5);
 }
 
-probe process("sdt.prog").mark("mark_f")
+probe process(@1).mark("mark_f")
 {
   printf("%d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 }
 
-probe process("sdt.prog").mark("mark_g")
+probe process(@1).mark("mark_g")
 {
   printf("%d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
 }
 
-probe process("sdt.prog").mark("mark_h")
+probe process(@1).mark("mark_h")
 {
   printf("%d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8);
 }
 
-probe process("sdt.prog").mark("mark_i")
+probe process(@1).mark("mark_i")
 {
   printf("%d %d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8, $arg9);
 }
 
-probe process("sdt.prog").mark("mark_j")
+probe process(@1).mark("mark_j")
 {
   printf("%d %d %d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8, $arg9, $arg10);
 }
-- 
cgit