Merge branch 'master' of ssh://kenistoj@sources.redhat.com/git/systemtap

11 files changed, 41 insertions, 13 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 18f04bbf..234ff66d 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-15  Mark Wielaard  <mjw@redhat.com>
+
+	* buildok/seventeen.stp: Fix 2.6.27 detection.
+	* testsuite/buildok/seven.stp: Likewise.
+
+2008-09-12  Frank Ch. Eigler  <fche@elastic.org>
+
+	* systemtap.base/uprobes.stp: Use printf in case pp() is long enough
+	to overflow MAXSTRINGLEN.
+
 2008-09-11  David Smith  <dsmith@redhat.com>
 
 	* lib/stap_run.exp: Ignore new warning.
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)
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  <fche@elastic.org>
+
+	* io/traceio2.stp: Make compatible with RHEL5.
+	* general/para-callgraph.meta: Tweak quoting for dejagnu passage.
+
 2008-08-15  Frank Ch. Eigler  <fche@elastic.org>
 
 	* 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",
diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog
index 0a3d51ae..772f980a 100644
--- a/testsuite/systemtap.syscall/ChangeLog
+++ b/testsuite/systemtap.syscall/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-17  Mark Wielaard  <mjw@redhat.com>
+
+	* forkwait.c: Low byte of flags is always set to SIGCHLD.
+
+2008-09-17  Mark Wielaard  <mjw@redhat.com>
+
+	* timer.c: Timer id can be arbitrary number.
+
+2008-09-17  Mark Wielaard  <mjw@redhat.com>
+
+	* swap.c: Don't try including unnecessary asm/page.h.
+
 2008-02-22  Frank Ch. Eigler  <fche@elastic.org>
 
 	* test.tcl: Support noexec /tmp by creating test directory
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--;
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 <unistd.h>
-#include <asm/page.h>
 #include <sys/swap.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;
 }