summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.examples
diff options
context:
space:
mode:
authorJim Keniston <jkenisto@us.ibm.com>2008-09-15 02:29:29 -0700
committerJim Keniston <jkenisto@us.ibm.com>2008-09-15 02:29:29 -0700
commit553987ef137f6d80b6133a97864942f865e60ece (patch)
tree5b471373c3640a8f30141a604667910e3d69aaee /testsuite/systemtap.examples
parentc79cd4b878c3d4e66fd9203107b078734cfbe0a1 (diff)
parent8844346125b135280bee9fee12cbdbceb750d898 (diff)
downloadsystemtap-steved-553987ef137f6d80b6133a97864942f865e60ece.tar.gz
systemtap-steved-553987ef137f6d80b6133a97864942f865e60ece.tar.xz
systemtap-steved-553987ef137f6d80b6133a97864942f865e60ece.zip
Merge branch 'master' of ssh://kenistoj@sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/systemtap.examples')
-rw-r--r--testsuite/systemtap.examples/ChangeLog5
-rw-r--r--testsuite/systemtap.examples/general/para-callgraph.meta4
-rwxr-xr-xtestsuite/systemtap.examples/io/traceio2.stp4
3 files changed, 10 insertions, 3 deletions
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",