From 8b524b8e33e94007b15f33546819056b56435cf2 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 12 Sep 2008 17:14:18 -0400 Subject: testsuite tweaks for rhel5 --- testsuite/ChangeLog | 5 +++++ testsuite/systemtap.base/uprobes.stp | 4 ++-- testsuite/systemtap.examples/ChangeLog | 5 +++++ testsuite/systemtap.examples/general/para-callgraph.meta | 4 ++-- testsuite/systemtap.examples/io/traceio2.stp | 4 +++- 5 files changed, 17 insertions(+), 5 deletions(-) (limited to 'testsuite') diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 18f04bbf..bc8af108 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-12 Frank Ch. Eigler + + * systemtap.base/uprobes.stp: Use printf in case pp() is long enough + to overflow MAXSTRINGLEN. + 2008-09-11 David Smith * lib/stap_run.exp: Ignore new warning. diff --git a/testsuite/systemtap.base/uprobes.stp b/testsuite/systemtap.base/uprobes.stp index 32bc1a70..b609f3a1 100755 --- a/testsuite/systemtap.base/uprobes.stp +++ b/testsuite/systemtap.base/uprobes.stp @@ -1,3 +1,3 @@ #! stap -p4 -probe process("./jennie").function("main").call { log(pp()." ".$$parms) } -probe process("./jennie").function("main").return { log(pp()." ".$$return) } +probe process("./jennie").function("main").call { printf("%s %s\n",pp(),$$parms) } +probe process("./jennie").function("main").return { printf("%s %s\n",pp(),$$return) } diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog index af641ba7..8d434357 100644 --- a/testsuite/systemtap.examples/ChangeLog +++ b/testsuite/systemtap.examples/ChangeLog @@ -1,3 +1,8 @@ +2008-09-12 Frank Ch. Eigler + + * io/traceio2.stp: Make compatible with RHEL5. + * general/para-callgraph.meta: Tweak quoting for dejagnu passage. + 2008-08-15 Frank Ch. Eigler * general/para-callgraph*: Extend. diff --git a/testsuite/systemtap.examples/general/para-callgraph.meta b/testsuite/systemtap.examples/general/para-callgraph.meta index 740ed5ce..9fcf26c6 100644 --- a/testsuite/systemtap.examples/general/para-callgraph.meta +++ b/testsuite/systemtap.examples/general/para-callgraph.meta @@ -3,5 +3,5 @@ name: para-callgraph.stp keywords: trace callgraph subsystem: general description: Print a timed per-thread callgraph, complete with function parameters and return values. The first parameter names the function probe points to trace. The optional second parameter names the probe points for trigger functions, which acts to enable tracing for only those functions that occur while the current thread is nested within the trigger. -test_check: stap -p4 para-callgraph.stp 'kernel.function("*@fs/proc*.c")' 'kernel.function("sys_read")' -test_installcheck: stap para-callgraph.stp 'kernel.function("*@fs/proc*.c")' 'kernel.function("sys_read")' -c 'cat /proc/sys/vm/*' +test_check: stap -p4 para-callgraph.stp kernel.function("*@fs/proc*.c") kernel.function("sys_read") +test_installcheck: stap para-callgraph.stp kernel.function("*@fs/proc*.c") kernel.function("sys_read") -c 'cat /proc/sys/vm/*' diff --git a/testsuite/systemtap.examples/io/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp index 656c38b3..988ea36c 100755 --- a/testsuite/systemtap.examples/io/traceio2.stp +++ b/testsuite/systemtap.examples/io/traceio2.stp @@ -12,7 +12,9 @@ probe begin { probe kernel.function ("vfs_write"), kernel.function ("vfs_read") { - dev_nr = $file->f_path->dentry->d_inode->i_sb->s_dev + dev_nr = $file-> + %( kernel_v < "2.6.19" %? f_dentry %: f_path->dentry %) + ->d_inode->i_sb->s_dev if (dev_nr == device_of_interest) printf ("%s(%d) %s 0x%x\n", -- cgit From fc22e8a361f3c19dcb048dc5f245565164b9d829 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 15 Sep 2008 21:17:59 +0200 Subject: Fix 2.6.27 detection. --- testsuite/ChangeLog | 5 +++++ testsuite/buildok/seven.stp | 2 +- testsuite/buildok/seventeen.stp | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'testsuite') diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index bc8af108..234ff66d 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-15 Mark Wielaard + + * buildok/seventeen.stp: Fix 2.6.27 detection. + * testsuite/buildok/seven.stp: Likewise. + 2008-09-12 Frank Ch. Eigler * systemtap.base/uprobes.stp: Use printf in case pp() is long enough diff --git a/testsuite/buildok/seven.stp b/testsuite/buildok/seven.stp index dc3bc786..874ce72b 100755 --- a/testsuite/buildok/seven.stp +++ b/testsuite/buildok/seven.stp @@ -6,7 +6,7 @@ # first: enums and ints -%( kernel_v <= "2.6.26" %? +%( kernel_v < "2.6.27" %? probe kernel.function("find_pid") { %( kernel_v >= "2.6.17" %? diff --git a/testsuite/buildok/seventeen.stp b/testsuite/buildok/seventeen.stp index e4a7a8e8..126db1fb 100755 --- a/testsuite/buildok/seventeen.stp +++ b/testsuite/buildok/seventeen.stp @@ -5,7 +5,7 @@ probe kernel.function("pipe_write") { -%( kernel_v > "2.6.26" %? +%( kernel_v >= "2.6.27" %? printf("0x%x\n", $write_pipefifo_fops->llseek) %: printf("0x%x\n", $write_fifo_fops->llseek) -- cgit From 66fc44b2df24bf0229def28be9126cefa945c6a0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 17 Sep 2008 16:48:54 +0200 Subject: Don't try including unnecessary asm/page.h in swap.c test. --- testsuite/systemtap.syscall/ChangeLog | 4 ++++ testsuite/systemtap.syscall/swap.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'testsuite') diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog index 0a3d51ae..ca123564 100644 --- a/testsuite/systemtap.syscall/ChangeLog +++ b/testsuite/systemtap.syscall/ChangeLog @@ -1,3 +1,7 @@ +2008-09-17 Mark Wielaard + + * swap.c: Don't try including unnecessary asm/page.h. + 2008-02-22 Frank Ch. Eigler * test.tcl: Support noexec /tmp by creating test directory diff --git a/testsuite/systemtap.syscall/swap.c b/testsuite/systemtap.syscall/swap.c index a2db301e..3708a477 100755 --- a/testsuite/systemtap.syscall/swap.c +++ b/testsuite/systemtap.syscall/swap.c @@ -1,6 +1,5 @@ /* COVERAGE: swapon swapoff */ #include -#include #include -- cgit From 3aa3a6bd7ff9730cbca2d695b4380e62f50adf31 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 17 Sep 2008 17:23:06 +0200 Subject: Timer id in timer.c test can be arbitrary number. --- testsuite/systemtap.syscall/ChangeLog | 4 ++++ testsuite/systemtap.syscall/timer.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'testsuite') diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog index ca123564..768b5c21 100644 --- a/testsuite/systemtap.syscall/ChangeLog +++ b/testsuite/systemtap.syscall/ChangeLog @@ -1,3 +1,7 @@ +2008-09-17 Mark Wielaard + + * timer.c: Timer id can be arbitrary number. + 2008-09-17 Mark Wielaard * swap.c: Don't try including unnecessary asm/page.h. diff --git a/testsuite/systemtap.syscall/timer.c b/testsuite/systemtap.syscall/timer.c index f7b888ae..947f6a77 100644 --- a/testsuite/systemtap.syscall/timer.c +++ b/testsuite/systemtap.syscall/timer.c @@ -16,16 +16,16 @@ int main() // timer_create (CLOCK_REALTIME, 0x[0]+, XXXX) syscall(SYS_timer_gettime, tid, &val); - // timer_gettime (0, XXXX) + // timer_gettime (NNNN, XXXX) syscall(SYS_timer_settime, 0, tid, &val, &oval); - // timer_settime (0, 0, \[0.000000,0.000000\], XXXX) + // timer_settime (0, NNNN, \[0.000000,0.000000\], XXXX) syscall(SYS_timer_getoverrun, tid); - // timer_getoverrun (0) + // timer_getoverrun (NNNN) syscall(SYS_timer_delete, tid); - // timer_delete (0) + // timer_delete (NNNN) return 0; } -- cgit From 8844346125b135280bee9fee12cbdbceb750d898 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 17 Sep 2008 17:58:58 +0200 Subject: Low byte of clone flags is always set to SIGCHLD in forkwait.c test. --- testsuite/systemtap.syscall/ChangeLog | 4 ++++ testsuite/systemtap.syscall/forkwait.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'testsuite') diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog index 768b5c21..772f980a 100644 --- a/testsuite/systemtap.syscall/ChangeLog +++ b/testsuite/systemtap.syscall/ChangeLog @@ -1,3 +1,7 @@ +2008-09-17 Mark Wielaard + + * forkwait.c: Low byte of flags is always set to SIGCHLD. + 2008-09-17 Mark Wielaard * timer.c: Timer id can be arbitrary number. diff --git a/testsuite/systemtap.syscall/forkwait.c b/testsuite/systemtap.syscall/forkwait.c index 10f8d6ac..ffc98708 100644 --- a/testsuite/systemtap.syscall/forkwait.c +++ b/testsuite/systemtap.syscall/forkwait.c @@ -12,7 +12,7 @@ int main () int status; child = fork(); - // clone (CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID) = NNNN + // clone (CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD) = NNNN if (!child) { int i = 0xfffff; while (i > 0) i--; -- cgit