Merge branch 'master' of ssh://sources.redhat.com/git/systemtap into pr6429-comp-unwindsyms

* 'master' of ssh://sources.redhat.com/git/systemtap:
  simplify systemtap.spec configuration vars
  Handles markers with no format string.
  Fixed task_finder.c kernel 2.6.25 change.
  PR6454: fix "stap -l" listing of space-laden probe point names
  Move examples to testsuite/systemtap.examples.
  PR6451: avoid one class of staprun shutdown deadlock (module/.ctl filehandle = 0)
  Made kernel 2.6.25 changes in task_finder.c.
  Move examples to testsuite/systemtap.examples
  PR6416: extend probing blacklist with more init/exit sections

1 files changed, 63 insertions, 0 deletions

diff --git a/testsuite/systemtap.examples/sleeptime.stp b/testsuite/systemtap.examples/sleeptime.stp
new file mode 100755
index 00000000..252e50cc
--- /dev/null
+++ b/testsuite/systemtap.examples/sleeptime.stp
@@ -0,0 +1,63 @@
+#! /usr/bin/env stap
+
+/*
+ * Copyright (C) 2006 Daniel Berrange, Red Hat Inc.
+ * Copyright (C) 2007 Will Cohen, Red Hat, Inc.
+ * 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Print out the amount of time spent in the nanosleep and compat_nanosleep
+ * systemcalls. This can help find which processes are waking based on time
+ * rather than some real event than needs to be handled.
+ *
+ * Format is:
+ * 12799538 3389 (xchat) nanosleep: 9547
+ * 12846944 2805 (NetworkManager) nanosleep: 100964
+ * 12947924 2805 (NetworkManager) nanosleep: 100946
+ * 13002925 4757 (sleep) nanosleep: 13000717
+ */
+
+global start
+global entry_nanosleep
+
+function timestamp:long() {
+  return gettimeofday_us() - start
+}
+
+function proc:string() {
+  return sprintf("%d (%s)", pid(), execname())
+}
+
+probe begin {
+ start = gettimeofday_us()
+}
+
+probe syscall.nanosleep {
+  t = gettimeofday_us(); p = pid()
+  entry_nanosleep[p] = t
+}
+
+probe syscall.nanosleep.return {
+  t = gettimeofday_us(); p = pid()
+  elapsed_time = t - entry_nanosleep[p]
+  printf("%d %s nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
+  delete entry_nanosleep[p]
+}
+
+probe syscall.compat_nanosleep ? {
+  t = gettimeofday_us(); p = pid()
+  entry_nanosleep[p] = t
+}
+
+probe syscall.compat_nanosleep.return ? {
+  t = gettimeofday_us(); p = pid()
+  elapsed_time = t - entry_nanosleep[p]
+  printf("%d %s compat_nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
+  delete entry_nanosleep[p]
+}