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

59 files changed, 145 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ccf17fb..033db1b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2008-04-25  Frank Ch. Eigler  <fche@elastic.org>
+
+	* systemtap.spec.in: Simplify configuration defaults.
+
+2008-04-25  David Smith  <dsmith@redhat.com>
+
+	PR 6455.
+	* tapsets.cxx (mark_builder::build): Handles markers with no
+	format string.
+
+2008-04-24  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 6454.
+	* main.cxx (printscript): Avoid string truncation heuristics, and
+	also avoid plain probe::printsig.  Hold nose and dig down into
+	raw location lists instead.
+
+2008-04-24  Will Cohen  <wcohen@redhat.com>
+
+	* aclocal.m4: Regenerated.
+	* Makefile.am (example/*): Moved to testsuite/systemtap.examples.
+	* Makefile.in: Regenerated.
+
+2008-04-23  Frank Ch. Eigler  <fche@elastic.org>
+
+	From: Srinivasa DS <srinivasa@in.ibm.com>
+	* tapsets.cxx (blacklisted_p): Blacklist more init/exit sections.
+
 2008-04-23  Frank Ch. Eigler  <fche@elastic.org>
 
 	* tapsets.cxx (common_probe_entryfn_prologue): Clear
diff --git a/Makefile.am b/Makefile.am
index 03fdd8c2..dd53d87f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,10 +150,13 @@ LDADD =
 EXTRA_DIST = buildrun.h elaborate.h loc2c.h session.h \
 	     parse.h staptree.h tapsets.h translate.h \
 	     cache.h hash.h mdfour.h util.h staplog.c coveragedb.h \
-	     examples testsuite systemtap.spec runtime tapset \
+	     testsuite systemtap.spec runtime tapset \
 	     git_version.h git_version.sh
 
-SAMPLE_DEST_DIR = $(distdir)/examples/samples
+EXAMPLE_DEST_DIR = $(distdir)/examples
+SAMPLE_DEST_DIR = $(EXAMPLE_DEST_DIR)/samples
+
+EXAMPLE_SRC = $(srcdir)/testsuite/systemtap.examples
 
 SAMPLE_SRC = $(srcdir)/testsuite/systemtap.samples/iotask.stp \
 	     $(srcdir)/testsuite/systemtap.samples/kmalloc-stacks.stp \
@@ -163,9 +166,14 @@ SAMPLE_SRC = $(srcdir)/testsuite/systemtap.samples/iotask.stp \
 	     $(srcdir)/testsuite/systemtap.samples/tcp_connections.stp \
 	     $(srcdir)/testsuite/systemtap.samples/topsys.stp
 
+dist-add-examples: $(EXAMPLE_SRC)
+	rm -rf $(EXAMPLE_DEST_DIR)
+	mkdir -p $(EXAMPLE_DEST_DIR)
+	cp -a $(EXAMPLE_SRC)/* $(EXAMPLE_DEST_DIR)/.
+
 # Copy some of the testsuite sample scripts to the distdir
 # 'examples/samples' directory.
-dist-add-samples: $(SAMPLE_SRC)
+dist-add-samples: $(SAMPLE_SRC) dist-add-examples
 	rm -rf $(SAMPLE_DEST_DIR)
 	mkdir -p $(SAMPLE_DEST_DIR)
 	cp $(SAMPLE_SRC) $(SAMPLE_DEST_DIR)
diff --git a/Makefile.in b/Makefile.in
index e1db0a3d..66dc43ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -328,10 +328,12 @@ LDADD =
 EXTRA_DIST = buildrun.h elaborate.h loc2c.h session.h \
 	     parse.h staptree.h tapsets.h translate.h \
 	     cache.h hash.h mdfour.h util.h staplog.c coveragedb.h \
-	     examples testsuite systemtap.spec runtime tapset \
+	     testsuite systemtap.spec runtime tapset \
 	     git_version.h git_version.sh
 
-SAMPLE_DEST_DIR = $(distdir)/examples/samples
+EXAMPLE_DEST_DIR = $(distdir)/examples
+SAMPLE_DEST_DIR = $(EXAMPLE_DEST_DIR)/samples
+EXAMPLE_SRC = $(srcdir)/testsuite/systemtap.examples
 SAMPLE_SRC = $(srcdir)/testsuite/systemtap.samples/iotask.stp \
 	     $(srcdir)/testsuite/systemtap.samples/kmalloc-stacks.stp \
 	     $(srcdir)/testsuite/systemtap.samples/kmalloc-top \
@@ -1146,8 +1148,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -1172,8 +1174,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1183,13 +1185,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1262,6 +1263,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -1289,6 +1294,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -1458,7 +1465,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 	clean-binPROGRAMS clean-generic clean-local \
 	clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \
 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
@@ -1528,9 +1535,14 @@ install-exec-hook:
 @BUILD_CRASHMOD_TRUE@	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
 @BUILD_CRASHMOD_TRUE@	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
 
+dist-add-examples: $(EXAMPLE_SRC)
+	rm -rf $(EXAMPLE_DEST_DIR)
+	mkdir -p $(EXAMPLE_DEST_DIR)
+	cp -a $(EXAMPLE_SRC)/* $(EXAMPLE_DEST_DIR)/.
+
 # Copy some of the testsuite sample scripts to the distdir
 # 'examples/samples' directory.
-dist-add-samples: $(SAMPLE_SRC)
+dist-add-samples: $(SAMPLE_SRC) dist-add-examples
 	rm -rf $(SAMPLE_DEST_DIR)
 	mkdir -p $(SAMPLE_DEST_DIR)
 	cp $(SAMPLE_SRC) $(SAMPLE_DEST_DIR)
diff --git a/aclocal.m4 b/aclocal.m4
index 9d70920d..0e2027cd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -47,8 +50,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -343,7 +348,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -391,13 +396,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -502,16 +507,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -872,7 +878,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 21b3cbf7..16a3c111 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-24  Will Cohen  <wcohen@redhat.com>
+
+	* Makefile.in: Regenerated.
+	
 2008-04-09  David Smith  <dsmith@redhat.com>
 
 	* .gitignore: New file.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e76f154d..efad693b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/main.cxx b/main.cxx
index cf6f0c41..4f8ddcf5 100644
--- a/main.cxx
+++ b/main.cxx
@@ -148,14 +148,18 @@ printscript(systemtap_session& s, ostream& o)
           #endif
 
           stringstream tmps;
-          second->printsig (tmps);
-          string tmp = tmps.str();
-          // trim anything other than the "head" of the probe point signature:
-          // alias1 *CUT* = exp1, exp2
-          // probe1 *CUT* /* pc=0xdeadbeef */ /* <- foo */
-          string::size_type space_pos = tmp.find(' ');
-          assert (space_pos != string::npos);
-          string pp = tmp.substr (0, space_pos);
+          const probe_alias *a = second->get_alias();
+          if (a)
+            {
+              assert (a->alias_names.size() >= 1);
+              a->alias_names[0]->print(tmps); // XXX: [0] is arbitrary; perhaps print all
+            }            
+          else
+            {
+              assert (second->locations.size() >= 1);
+              second->locations[0]->print(tmps); // XXX: [0] is less arbitrary here, but still ...
+            }
+          string pp = tmps.str();
 
           // Now duplicate-eliminate.  An alias may have expanded to
           // several actual derived probe points, but we only want to
diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index e3c1ea8d..a2e49822 100644
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-25  David Smith  <dsmith@redhat.com>
+
+	From Srinivasa <srinivasa@in.ibm.com>
+	* task_finder.c (__stp_get_mm_path): Fixed kernel 2.6.25 change.
+
+2008-04-24  David Smith  <dsmith@redhat.com>
+
+	* task_finder.c (__stp_get_mm_path): Made kernel 2.6.25 changes.
+
 2008-04-16  David Smith  <dsmith@redhat.com>
 
 	* task_finder.c (__stp_get_mm_path): Made kernel 2.6.18 changes.
diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog
index f1abd736..9e0ccb73 100644
--- a/runtime/staprun/ChangeLog
+++ b/runtime/staprun/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-24  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 6451.
+	* common.c (control_channel): Initialize to -1.
+	* ctl.c (close_ctl_channel): Tolerate fd=0.
+
 2008-04-22  Martin Hunt  <hunt@redhat.com>
 
 	* cap.c (init_cap): Detect capabilities failure and
diff --git a/runtime/staprun/common.c b/runtime/staprun/common.c
index f8fc418c..b716d27f 100644
--- a/runtime/staprun/common.c
+++ b/runtime/staprun/common.c
@@ -31,7 +31,7 @@ char *modname = NULL;
 char *modpath = "";
 char *modoptions[MAXMODOPTIONS];
 
-int control_channel = 0;
+int control_channel = -1; /* NB: fd==0 possible */
 
 void parse_args(int argc, char **argv)
 {
diff --git a/runtime/staprun/ctl.c b/runtime/staprun/ctl.c
index 15c5c3d3..4597bf72 100644
--- a/runtime/staprun/ctl.c
+++ b/runtime/staprun/ctl.c
@@ -46,8 +46,8 @@ int init_ctl_channel(const char *name, int verb)
 
 void close_ctl_channel(void)
 {
-	if (control_channel > 0) {
+  if (control_channel >= 0) {
 		close(control_channel);
-		control_channel = 0;
+		control_channel = -1;
 	}
 }
diff --git a/runtime/task_finder.c b/runtime/task_finder.c
index d0a9a40f..aafe9c32 100644
--- a/runtime/task_finder.c
+++ b/runtime/task_finder.c
@@ -153,11 +153,12 @@ __stp_get_mm_path(struct mm_struct *mm, char *buf, int buflen)
 		vma = vma->vm_next;
 	}
 	if (vma) {
-		struct vfsmount *mnt = mntget(vma->vm_file->f_vfsmnt);
-		struct dentry *dentry = dget(vma->vm_file->f_dentry);
-		rc = d_path(dentry, mnt, buf, buflen);
-		dput(dentry);
-		mntput(mnt);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+		rc = d_path(vma->vm_file->f_dentry, vma->vm_file->f_vfsmnt,
+			    buf, buflen);
+#else
+		rc = d_path(&(vma->vm_file->f_path), buf, buflen);
+#endif
 	}
 	else {
 		*buf = '\0';
diff --git a/systemtap.spec.in b/systemtap.spec.in
index dd105790..e663b15a 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -1,19 +1,9 @@
-# Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
 %define release 1
-# Version number of oldest elfutils release that works with systemtap.
-%define elfutils_version 0.127
-
-# Default options (suitable for fedora)
 %define with_sqlite 1
 %define with_docs 1
 %define with_crash 0
 %define with_bundled_elfutils 0
-
-# Enable these options by default for RHEL
-%if 0%{?rhel} >= 5
-%define with_crash 1
-%define with_bundled_elfutils 1
-%endif
+%define elfutils_version 0.127
 
 Name: systemtap
 Version: @VERSION@
diff --git a/tapsets.cxx b/tapsets.cxx
index 6e776a58..23e85a0e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2618,7 +2618,13 @@ dwarf_query::blacklisted_p(const string& funcname,
                            Dwarf_Addr addr)
 {
   if (section.substr(0, 6) == string(".init.") ||
-      section.substr(0, 6) == string(".exit."))
+      section.substr(0, 6) == string(".exit.") ||
+      section.substr(0, 9) == string(".devinit.") ||
+      section.substr(0, 9) == string(".devexit.") ||
+      section.substr(0, 9) == string(".cpuinit.") ||
+      section.substr(0, 9) == string(".cpuexit.") ||
+      section.substr(0, 9) == string(".meminit.") ||
+      section.substr(0, 9) == string(".memexit."))
     {
       // NB: module .exit. routines could be probed in theory:
       // if the exit handler in "struct module" is diverted,
@@ -6482,6 +6488,11 @@ mark_builder::build(systemtap_session & sess,
 	  string::size_type notwhite = format.find_first_not_of(" \t");
 	  format.erase(0, notwhite);
 
+	  // If the format is empty, make sure we add back a space
+	  // character, which is what MARK_NOARGS expands to.
+	  if (format.length() == 0)
+	    format = " ";
+
 	  if (sess.verbose>3)
 	    clog << "'" << name << "' '" << module << "' '" << format
 		 << "'" << endl;
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 878a8c39..b8fe2db6 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-24  Will Cohen  <wcohen@redhat.com>
+
+	* systemtap.examples: examples moved into testsuite.
+
 2008-04-22  David Smith  <dsmith@redhat.com>
 
 	* systemtap.base/utrace_p5.exp: Simplfied a little.
diff --git a/examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 78083901..78083901 100644
--- a/examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
diff --git a/examples/README b/testsuite/systemtap.examples/README
index 6718a55a..6718a55a 100644
--- a/examples/README
+++ b/testsuite/systemtap.examples/README
diff --git a/examples/futexes.stp b/testsuite/systemtap.examples/futexes.stp
index 16c62937..16c62937 100755
--- a/examples/futexes.stp
+++ b/testsuite/systemtap.examples/futexes.stp
diff --git a/examples/futexes.txt b/testsuite/systemtap.examples/futexes.txt
index 51de4352..51de4352 100644
--- a/examples/futexes.txt
+++ b/testsuite/systemtap.examples/futexes.txt
diff --git a/examples/helloworld.stp b/testsuite/systemtap.examples/helloworld.stp
index efe45b79..efe45b79 100755
--- a/examples/helloworld.stp
+++ b/testsuite/systemtap.examples/helloworld.stp
diff --git a/examples/iostat-scsi.stp b/testsuite/systemtap.examples/iostat-scsi.stp
index ef778e53..ef778e53 100755
--- a/examples/iostat-scsi.stp
+++ b/testsuite/systemtap.examples/iostat-scsi.stp
diff --git a/examples/iostat-scsi.txt b/testsuite/systemtap.examples/iostat-scsi.txt
index 8222f659..8222f659 100644
--- a/examples/iostat-scsi.txt
+++ b/testsuite/systemtap.examples/iostat-scsi.txt
diff --git a/examples/iotime.stp b/testsuite/systemtap.examples/iotime.stp
index a5b36449..a5b36449 100755
--- a/examples/iotime.stp
+++ b/testsuite/systemtap.examples/iotime.stp
diff --git a/examples/nettop.stp b/testsuite/systemtap.examples/nettop.stp
index 96db413a..96db413a 100755
--- a/examples/nettop.stp
+++ b/testsuite/systemtap.examples/nettop.stp
diff --git a/examples/nettop.txt b/testsuite/systemtap.examples/nettop.txt
index 2bfd4967..2bfd4967 100644
--- a/examples/nettop.txt
+++ b/testsuite/systemtap.examples/nettop.txt
diff --git a/examples/pf2.stp b/testsuite/systemtap.examples/pf2.stp
index 96fdb7e7..96fdb7e7 100755
--- a/examples/pf2.stp
+++ b/testsuite/systemtap.examples/pf2.stp
diff --git a/examples/pf2.txt b/testsuite/systemtap.examples/pf2.txt
index 0fafe17e..0fafe17e 100644
--- a/examples/pf2.txt
+++ b/testsuite/systemtap.examples/pf2.txt
diff --git a/examples/sig_by_pid.stp b/testsuite/systemtap.examples/sig_by_pid.stp
index 9c1493f5..9c1493f5 100755
--- a/examples/sig_by_pid.stp
+++ b/testsuite/systemtap.examples/sig_by_pid.stp
diff --git a/examples/sig_by_pid.txt b/testsuite/systemtap.examples/sig_by_pid.txt
index 927b4607..927b4607 100644
--- a/examples/sig_by_pid.txt
+++ b/testsuite/systemtap.examples/sig_by_pid.txt
diff --git a/examples/sig_by_proc.stp b/testsuite/systemtap.examples/sig_by_proc.stp
index ce845aed..ce845aed 100755
--- a/examples/sig_by_proc.stp
+++ b/testsuite/systemtap.examples/sig_by_proc.stp
diff --git a/examples/sig_by_proc.txt b/testsuite/systemtap.examples/sig_by_proc.txt
index d09da9fe..d09da9fe 100644
--- a/examples/sig_by_proc.txt
+++ b/testsuite/systemtap.examples/sig_by_proc.txt
diff --git a/examples/sigmon.stp b/testsuite/systemtap.examples/sigmon.stp
index 31d7822e..31d7822e 100755
--- a/examples/sigmon.stp
+++ b/testsuite/systemtap.examples/sigmon.stp
diff --git a/examples/sleeptime.stp b/testsuite/systemtap.examples/sleeptime.stp
index 252e50cc..252e50cc 100755
--- a/examples/sleeptime.stp
+++ b/testsuite/systemtap.examples/sleeptime.stp
diff --git a/examples/small_demos/ansi_colors.stp b/testsuite/systemtap.examples/small_demos/ansi_colors.stp
index 0d9d7c47..0d9d7c47 100755
--- a/examples/small_demos/ansi_colors.stp
+++ b/testsuite/systemtap.examples/small_demos/ansi_colors.stp
diff --git a/examples/small_demos/click.wav b/testsuite/systemtap.examples/small_demos/click.wav
index 8214b229..8214b229 100644
--- a/examples/small_demos/click.wav
+++ b/testsuite/systemtap.examples/small_demos/click.wav
diff --git a/examples/small_demos/close.stp b/testsuite/systemtap.examples/small_demos/close.stp
index 7ba2a036..7ba2a036 100755
--- a/examples/small_demos/close.stp
+++ b/testsuite/systemtap.examples/small_demos/close.stp
diff --git a/examples/small_demos/demo_script.txt b/testsuite/systemtap.examples/small_demos/demo_script.txt
index f3166a49..f3166a49 100644
--- a/examples/small_demos/demo_script.txt
+++ b/testsuite/systemtap.examples/small_demos/demo_script.txt
diff --git a/examples/small_demos/fileopen.stp b/testsuite/systemtap.examples/small_demos/fileopen.stp
index c1298f9c..c1298f9c 100755
--- a/examples/small_demos/fileopen.stp
+++ b/testsuite/systemtap.examples/small_demos/fileopen.stp
diff --git a/examples/small_demos/key.stp b/testsuite/systemtap.examples/small_demos/key.stp
index 6d2d6c3f..6d2d6c3f 100755
--- a/examples/small_demos/key.stp
+++ b/testsuite/systemtap.examples/small_demos/key.stp
diff --git a/examples/small_demos/keyhack.stp b/testsuite/systemtap.examples/small_demos/keyhack.stp
index 3137baad..3137baad 100755
--- a/examples/small_demos/keyhack.stp
+++ b/testsuite/systemtap.examples/small_demos/keyhack.stp
diff --git a/examples/small_demos/kmalloc.stp b/testsuite/systemtap.examples/small_demos/kmalloc.stp
index 9157928d..9157928d 100755
--- a/examples/small_demos/kmalloc.stp
+++ b/testsuite/systemtap.examples/small_demos/kmalloc.stp
diff --git a/examples/small_demos/kmalloc2.stp b/testsuite/systemtap.examples/small_demos/kmalloc2.stp
index 2622dd2f..2622dd2f 100755
--- a/examples/small_demos/kmalloc2.stp
+++ b/testsuite/systemtap.examples/small_demos/kmalloc2.stp
diff --git a/examples/small_demos/proc_snoop.stp b/testsuite/systemtap.examples/small_demos/proc_snoop.stp
index 24499b4b..24499b4b 100755
--- a/examples/small_demos/proc_snoop.stp
+++ b/testsuite/systemtap.examples/small_demos/proc_snoop.stp
diff --git a/examples/small_demos/prof.stp b/testsuite/systemtap.examples/small_demos/prof.stp
index 389f743a..389f743a 100755
--- a/examples/small_demos/prof.stp
+++ b/testsuite/systemtap.examples/small_demos/prof.stp
diff --git a/examples/small_demos/return.wav b/testsuite/systemtap.examples/small_demos/return.wav
index 20f978cc..20f978cc 100644
--- a/examples/small_demos/return.wav
+++ b/testsuite/systemtap.examples/small_demos/return.wav
diff --git a/examples/small_demos/rwtiming.stp b/testsuite/systemtap.examples/small_demos/rwtiming.stp
index d570c581..d570c581 100755
--- a/examples/small_demos/rwtiming.stp
+++ b/testsuite/systemtap.examples/small_demos/rwtiming.stp
diff --git a/examples/small_demos/sched_snoop.stp b/testsuite/systemtap.examples/small_demos/sched_snoop.stp
index 623643dd..623643dd 100755
--- a/examples/small_demos/sched_snoop.stp
+++ b/testsuite/systemtap.examples/small_demos/sched_snoop.stp
diff --git a/examples/small_demos/sys.stp b/testsuite/systemtap.examples/small_demos/sys.stp
index 2df20bc3..2df20bc3 100755
--- a/examples/small_demos/sys.stp
+++ b/testsuite/systemtap.examples/small_demos/sys.stp
diff --git a/examples/small_demos/top.stp b/testsuite/systemtap.examples/small_demos/top.stp
index b46b9940..b46b9940 100755
--- a/examples/small_demos/top.stp
+++ b/testsuite/systemtap.examples/small_demos/top.stp
diff --git a/examples/socket-trace.stp b/testsuite/systemtap.examples/socket-trace.stp
index 13ab8e06..13ab8e06 100755
--- a/examples/socket-trace.stp
+++ b/testsuite/systemtap.examples/socket-trace.stp
diff --git a/examples/socktop b/testsuite/systemtap.examples/socktop
index 123e37e9..123e37e9 100755
--- a/examples/socktop
+++ b/testsuite/systemtap.examples/socktop
diff --git a/examples/socktop.txt b/testsuite/systemtap.examples/socktop.txt
index 0ebce003..0ebce003 100644
--- a/examples/socktop.txt
+++ b/testsuite/systemtap.examples/socktop.txt
diff --git a/examples/syscalls_by_pid.stp b/testsuite/systemtap.examples/syscalls_by_pid.stp
index 47aa4955..47aa4955 100755
--- a/examples/syscalls_by_pid.stp
+++ b/testsuite/systemtap.examples/syscalls_by_pid.stp
diff --git a/examples/syscalls_by_pid.txt b/testsuite/systemtap.examples/syscalls_by_pid.txt
index 4943a139..4943a139 100644
--- a/examples/syscalls_by_pid.txt
+++ b/testsuite/systemtap.examples/syscalls_by_pid.txt
diff --git a/examples/syscalls_by_proc.stp b/testsuite/systemtap.examples/syscalls_by_proc.stp
index af7d6932..af7d6932 100755
--- a/examples/syscalls_by_proc.stp
+++ b/testsuite/systemtap.examples/syscalls_by_proc.stp
diff --git a/examples/syscalls_by_proc.txt b/testsuite/systemtap.examples/syscalls_by_proc.txt
index dd554083..dd554083 100644
--- a/examples/syscalls_by_proc.txt
+++ b/testsuite/systemtap.examples/syscalls_by_proc.txt
diff --git a/examples/syscalltimes b/testsuite/systemtap.examples/syscalltimes
index 84ca77a9..84ca77a9 100755
--- a/examples/syscalltimes
+++ b/testsuite/systemtap.examples/syscalltimes
diff --git a/examples/syscalltimes.txt b/testsuite/systemtap.examples/syscalltimes.txt
index d50f73ad..d50f73ad 100644
--- a/examples/syscalltimes.txt
+++ b/testsuite/systemtap.examples/syscalltimes.txt
diff --git a/examples/wait4time.stp b/testsuite/systemtap.examples/wait4time.stp
index 568239b9..568239b9 100755
--- a/examples/wait4time.stp
+++ b/testsuite/systemtap.examples/wait4time.stp