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

Conflicts:

	Makefile.in
	configure
	doc/Makefile.in
	doc/SystemTap_Tapset_Reference/Makefile.in
	grapher/Makefile.in
	testsuite/configure

1 files changed, 20 insertions, 0 deletions

diff --git a/testsuite/systemtap.base/pr10854.stp b/testsuite/systemtap.base/pr10854.stp
new file mode 100644
index 00000000..55f027f2
--- /dev/null
+++ b/testsuite/systemtap.base/pr10854.stp
@@ -0,0 +1,20 @@
+function trace(entry_p) {
+   if(tid() in trace)
+       printf("%s%s%s\n",thread_indent(entry_p),
+		       	 (entry_p>0?"->":"<-"),
+		         probefunc())
+}
+
+global trace
+probe kernel.function(@1).call {
+   if (execname() == "staprun") next # skip our own helper process
+   trace[tid()] = 1
+   trace(1)
+}
+probe kernel.function(@1).return {
+   trace(-1)
+   delete trace[tid()]
+}
+
+probe kernel.function(@2).call { trace(1) }
+probe kernel.function(@2).return { trace(-1) }