From 1f0cfd980bc0a5e3e360f4ee46808b239bca6b55 Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Tue, 16 Dec 2008 10:34:01 -0500 Subject: Convert .mark to .statement(0x) instead of .statement(foo.c:N) --- testsuite/systemtap.base/static_uprobes.exp | 74 +++++++++++++++++++++++++---- testsuite/systemtap.base/static_uprobes.stp | 14 ------ 2 files changed, 66 insertions(+), 22 deletions(-) delete mode 100644 testsuite/systemtap.base/static_uprobes.stp (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 78641d3f..f3f26d8a 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -8,6 +8,7 @@ set sup_flags "additional_flags=-iquote$env(SYSTEMTAP_RUNTIME) additional_flags= set fp [open $sup_srcpath "w"] puts $fp " #include +#define USE_STAP_PROBE 1 #include \"sduprobes.h\" foo () @@ -24,12 +25,13 @@ bar (int i) baz (int i, char* s) { + STAP_PROBE1(tstlabel,label0,i); if (i == 0) i = 1000; STAP_PROBE2(tstlabel,label3,i,s); } -buz () +buz (int parm) { } @@ -39,6 +41,7 @@ main () foo(); bar(2); baz(3,\"abc\"); + buz(4); } " close $fp @@ -52,33 +55,85 @@ if { $res != "" } { pass "compiling static_uprobes.c" } +set fp [open "[pwd]/static_uprobes.stp" "w"] +puts $fp " +probe process(\"static_uprobes.x\").mark(\"label0\") +{ + printf(\"In label0 probe %#x\\n\", \$arg1) +} +probe process(\"static_uprobes.x\").mark(\"label1\") +{ + printf(\"In label1 probe\\n\") +} +probe process(\"static_uprobes.x\").mark(\"label2\") +{ + printf(\"In label2 probe %#x\\n\", \$arg1) +} +probe process(\"static_uprobes.x\").mark(\"label3\") +{ + printf(\"In label3 probe %#x %#x\\n\", \$arg1, \$arg2) +} +" +close $fp + set ok 0 -spawn stap -c $sup_exepath $srcdir/$subdir/static_uprobes.stp +verbose -log "spawn stap -c $sup_exepath [pwd]/static_uprobes.stp" +spawn stap -c $sup_exepath [pwd]/static_uprobes.stp expect { -timeout 180 -re {In label1 probe} { incr ok; exp_continue } -re {In label2 probe 0x2} { incr ok; exp_continue } + -re {In label0 probe 0x3} { incr ok; exp_continue } -re {In label3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } timeout { fail "$test (timeout)" } eof { } } +if {$ok == 4} { pass "$test" } { fail "$test ($ok)" } +set ok 0 + # Now do a debuginfo style probe of the above test set fp [open "[pwd]/static_uprobes.sh" "w"] puts $fp " ed $sup_srcpath < Date: Sun, 21 Dec 2008 22:48:38 -0500 Subject: Put a block around the probe point. --- testsuite/systemtap.base/static_uprobes.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index f3f26d8a..354256db 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -112,7 +112,7 @@ set fp [open "[pwd]/static_uprobes.stp" "w"] puts $fp " probe process(\"static_uprobes.x\").mark(\"label0\") { - printf(\"In label0 probe %#x\\n\", \$label0_arg1) + printf(\"In label0 probe %#x\\n\", \$arg1) } probe process(\"static_uprobes.x\").mark(\"label1\") { @@ -120,15 +120,15 @@ probe process(\"static_uprobes.x\").mark(\"label1\") } probe process(\"static_uprobes.x\").mark(\"label2\") { - printf(\"In label2 probe %#x\\n\", \$label2_arg1) + printf(\"In label2 probe %#x\\n\", \$arg1) } probe process(\"static_uprobes.x\").mark(\"label3\") { - printf(\"In label3 probe %#x %#x\\n\", \$label3_arg1, \$label3_arg2) + printf(\"In label3 probe %#x %#x\\n\", \$arg1, \$arg2) } probe process(\"static_uprobes.x\").mark(\"label4\") { - printf(\"In label4 dtrace probe %#x\\n\", \$label4_arg1) + printf(\"In label4 dtrace probe %#x\\n\", \$arg1) } " close $fp -- cgit From dc38c256fac058289cdebd0fde881b4faf24b9d1 Mon Sep 17 00:00:00 2001 From: Wenji Huang Date: Sun, 11 Jan 2009 18:39:55 -0500 Subject: Fix compilation warning of too large number on 32-bits machines. --- testsuite/systemtap.base/badkprobe.exp | 1 + 1 file changed, 1 insertion(+) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/badkprobe.exp b/testsuite/systemtap.base/badkprobe.exp index 1a1dbad5..efc06695 100644 --- a/testsuite/systemtap.base/badkprobe.exp +++ b/testsuite/systemtap.base/badkprobe.exp @@ -5,6 +5,7 @@ if {! [installtest_p]} { untested $test; return } spawn stap -g -w -e "$script" expect { + -timeout 60 -re "^WARNING: probe .*registration error.*" { pass $test } eof { fail "$test (eof)" } timeout { fail "$test (timeout)" } -- cgit From b899aa795f925edb7fad318d2e90bb9c3da90b24 Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Tue, 13 Jan 2009 17:17:47 -0500 Subject: Create the rpm subpackage systemtap-sdt-devel --- testsuite/systemtap.base/static_uprobes.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 354256db..34bd33a4 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -9,7 +9,7 @@ set fp [open $sup_srcpath "w"] puts $fp " #include #define USE_STAP_PROBE 1 -#include \"sduprobes.h\" +#include \"sdt.h\" foo () { -- cgit From ac9a5a0b7a603fcae02541726416b6ccdf41efd9 Mon Sep 17 00:00:00 2001 From: Wenji Huang Date: Mon, 19 Jan 2009 23:44:54 -0500 Subject: Add checking utrace in test cases. --- testsuite/systemtap.base/bz5274.exp | 8 ++++++++ testsuite/systemtap.base/bz6850.exp | 9 +++++++++ testsuite/systemtap.base/static_uprobes.exp | 9 +++++++++ testsuite/systemtap.base/uprobes.exp | 9 +++++++++ 4 files changed, 35 insertions(+) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/bz5274.exp b/testsuite/systemtap.base/bz5274.exp index 6e95a58b..db0e0a46 100755 --- a/testsuite/systemtap.base/bz5274.exp +++ b/testsuite/systemtap.base/bz5274.exp @@ -14,6 +14,14 @@ if {$err == "" && [file exists $test]} then { pass "$test compile" if {! [installtest_p]} { untested "$test -p5"; return } +# Try to find utrace_attach symbol in /proc/kallsyms +# copy from utrace_p5.exp +set utrace_support_found 0 +set path "/proc/kallsyms" +if {! [catch {exec grep -q utrace_attach $path} dummy]} { + set utrace_support_found 1 +} +if {$utrace_support_found == 0} { untested "$test -p5"; return } if {[catch {exec stap $tpath.stp -c "$srcdir/$subdir/$test.sh"} res]} { untested "$test longjmp to a uretprobed function" diff --git a/testsuite/systemtap.base/bz6850.exp b/testsuite/systemtap.base/bz6850.exp index b06b1696..73fedc8a 100644 --- a/testsuite/systemtap.base/bz6850.exp +++ b/testsuite/systemtap.base/bz6850.exp @@ -3,6 +3,15 @@ set test bz6850 catch {exec gcc -g -o bz6850 $srcdir/$subdir/bz6850.c} err if {$err == "" && [file exists bz6850]} then { pass "$test compile" } else { fail "$test compile" } +# Try to find utrace_attach symbol in /proc/kallsyms +# copy from utrace_p5.exp +set utrace_support_found 0 +set path "/proc/kallsyms" +if {! [catch {exec grep -q utrace_attach $path} dummy]} { + set utrace_support_found 1 +} +if {$utrace_support_found == 0} { untested "$test -p4"; untested "$test -p5"; return } + set rc [stap_run_batch $srcdir/$subdir/bz6850.stp] if {$rc == 0} then { pass "$test -p4" } else { fail "$test -p4" } diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 34bd33a4..4af688dc 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -76,6 +76,15 @@ probe process(\"static_uprobes.x\").mark(\"label3\") " close $fp +# Try to find utrace_attach symbol in /proc/kallsyms +# copy from utrace_p5.exp +set utrace_support_found 0 +set path "/proc/kallsyms" +if {! [catch {exec grep -q utrace_attach $path} dummy]} { + set utrace_support_found 1 +} +if {$utrace_support_found == 0} { untested "$test"; return } + set ok 0 verbose -log "spawn stap -c $sup_exepath [pwd]/static_uprobes.stp" spawn stap -c $sup_exepath [pwd]/static_uprobes.stp diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index 408ba8c4..e8318586 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -18,6 +18,15 @@ if [file exists $path] then { pass "$test prep" } else { fail "$test prep" } catch {exec gcc -g -o jennie jennie.c} err if {$err == "" && [file exists jennie]} then { pass "$test compile" } else { fail "$test compile" } +# Try to find utrace_attach symbol in /proc/kallsyms +# copy from utrace_p5.exp +set utrace_support_found 0 +set path "/proc/kallsyms" +if {! [catch {exec grep -q utrace_attach $path} dummy]} { + set utrace_support_found 1 +} +if {$utrace_support_found == 0} { untested "$test -p4"; untested "$test -p5"; return } + set rc [stap_run_batch $srcdir/$subdir/uprobes.stp] if {$rc == 0} then { pass "$test -p4" } else { fail "$test -p4" } -- cgit From 46be0ea9347282f992df1c9579921026b9d88336 Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Tue, 20 Jan 2009 11:07:08 -0500 Subject: Don't test -lsduprobe.s for now. --- testsuite/systemtap.base/static_uprobes.exp | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 4af688dc..a27ba2a7 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -46,14 +46,14 @@ main () " close $fp -set res [target_compile $sup_srcpath $sup_exepath executable $sup_flags] -if { $res != "" } { - verbose "target_compile failed: $res" 2 - fail "compiling static_uprobes.c" - return -} else { - pass "compiling static_uprobes.c" -} +# set res [target_compile $sup_srcpath $sup_exepath executable $sup_flags] +# if { $res != "" } { +# verbose "target_compile failed: $res" 2 +# fail "compiling static_uprobes.c" +# return +# } else { +# pass "compiling static_uprobes.c" +# } set fp [open "[pwd]/static_uprobes.stp" "w"] puts $fp " @@ -86,19 +86,19 @@ if {! [catch {exec grep -q utrace_attach $path} dummy]} { if {$utrace_support_found == 0} { untested "$test"; return } set ok 0 -verbose -log "spawn stap -c $sup_exepath [pwd]/static_uprobes.stp" -spawn stap -c $sup_exepath [pwd]/static_uprobes.stp -expect { - -timeout 180 - -re {In label1 probe} { incr ok; exp_continue } - -re {In label2 probe 0x2} { incr ok; exp_continue } - -re {In label0 probe 0x3} { incr ok; exp_continue } - -re {In label3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } - timeout { fail "$test (timeout)" } - eof { } -} - -if {$ok == 4} { pass "$test" } { fail "$test ($ok)" } +# verbose -log "spawn stap -c $sup_exepath [pwd]/static_uprobes.stp" +# spawn stap -c $sup_exepath [pwd]/static_uprobes.stp +# expect { +# -timeout 180 +# -re {In label1 probe} { incr ok; exp_continue } +# -re {In label2 probe 0x2} { incr ok; exp_continue } +# -re {In label0 probe 0x3} { incr ok; exp_continue } +# -re {In label3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } +# timeout { fail "$test (timeout)" } +# eof { } +# } + +# if {$ok == 4} { pass "$test" } { fail "$test ($ok)" } set ok 0 # Now do a debuginfo style probe of the above test -- cgit From c1008fd01d322bb12e66cb8dc513d488082777a4 Mon Sep 17 00:00:00 2001 From: Stan Cox Date: Thu, 22 Jan 2009 14:23:49 -0500 Subject: Add dtrace -h support --- testsuite/systemtap.base/static_uprobes.exp | 80 +++++++++++++++++------------ 1 file changed, 46 insertions(+), 34 deletions(-) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index a27ba2a7..eb0d1c6e 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -9,26 +9,26 @@ set fp [open $sup_srcpath "w"] puts $fp " #include #define USE_STAP_PROBE 1 -#include \"sdt.h\" +#include \"static_uprobes.h\" foo () { - STAP_PROBE(tstlabel,label1); + STAP_PROBE(static_uprobes,test_probe_1); } bar (int i) { if (i == 0) i = 1000; - STAP_PROBE1(tstlabel,label2,i); + STAP_PROBE1(static_uprobes,test_probe_2,i); } baz (int i, char* s) { - STAP_PROBE1(tstlabel,label0,i); + STAP_PROBE1(static_uprobes,test_probe_0,i); if (i == 0) i = 1000; - STAP_PROBE2(tstlabel,label3,i,s); + STATIC_UPROBES_TEST_PROBE_3(i,s); } buz (int parm) @@ -57,21 +57,21 @@ close $fp set fp [open "[pwd]/static_uprobes.stp" "w"] puts $fp " -probe process(\"static_uprobes.x\").mark(\"label0\") +probe process(\"static_uprobes.x\").mark(\"test_probe_0\") { - printf(\"In label0 probe %#x\\n\", \$arg1) + printf(\"In test_probe_0 probe %#x\\n\", \$arg1) } -probe process(\"static_uprobes.x\").mark(\"label1\") +probe process(\"static_uprobes.x\").mark(\"test_probe_1\") { - printf(\"In label1 probe\\n\") + printf(\"In test_probe_1 probe\\n\") } -probe process(\"static_uprobes.x\").mark(\"label2\") +probe process(\"static_uprobes.x\").mark(\"test_probe_2\") { - printf(\"In label2 probe %#x\\n\", \$arg1) + printf(\"In test_probe_2 probe %#x\\n\", \$arg1) } -probe process(\"static_uprobes.x\").mark(\"label3\") +probe process(\"static_uprobes.x\").mark(\"test_probe_3\") { - printf(\"In label3 probe %#x %#x\\n\", \$arg1, \$arg2) + printf(\"In test_probe_3 probe %#x %#x\\n\", \$arg1, \$arg2) } " close $fp @@ -90,10 +90,10 @@ set ok 0 # spawn stap -c $sup_exepath [pwd]/static_uprobes.stp # expect { # -timeout 180 -# -re {In label1 probe} { incr ok; exp_continue } -# -re {In label2 probe 0x2} { incr ok; exp_continue } -# -re {In label0 probe 0x3} { incr ok; exp_continue } -# -re {In label3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } +# -re {In test_probe_1 probe} { incr ok; exp_continue } +# -re {In test_probe_2 probe 0x2} { incr ok; exp_continue } +# -re {In test_probe_0 probe 0x3} { incr ok; exp_continue } +# -re {In test_probe_3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } # timeout { fail "$test (timeout)" } # eof { } # } @@ -109,7 +109,7 @@ ed $sup_srcpath <