Merge commit 'origin/master' into pr4225

* commit 'origin/master': (34 commits)
  PR5049: fix overbroad effects of naive "*" prefixing; instead use optional "*/" only.
  stap-serverd was incorectly determining that the server could
  stapprobes man page: clarify statement(NUM).absolute and process("path") searching
  PR5049: prefix with "*" any filenames given in "fn@filename:line" probes
  Indentation fix.
  Redirect stderr gets redircted so warnings don't let example script run fail.
  PR6835. io/io_submit.stp: Fix #! start. Convert to normal line-ending.
  PR2895. Add proper #! /usr/bin/env stap line. Make example scripts executable.
  Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts.
  example index: only warn if old, do not regenerate
  Start/stop the systemtap server from systemtap.exp and not in the top level Makefile.
  Lower statement wildcard test matching threshold.
  Moved details of utrace detach to stap_utrace_detach().
  Saves thread vma information.
  Always generate examples indexes and install examples from srcdir.
  Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir.
  Add index of subsystem and keywords at top of HTML indexes.
  Don't output output, exits, status line in indexes (mentioned in descriptions).
  Disable chmodding of samples/kmalloc-top in spec file since it isn't installed.
  Make sure examples indexes are always generated in builddir.
  ...

1 files changed, 36 insertions, 82 deletions

diff --git a/Makefile.in b/Makefile.in
index e3b6f146..4ed771e8 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.
@@ -338,30 +338,7 @@ EXTRA_DIST = auto_free.h buildrun.h elaborate.h loc2c.h session.h \
 	     systemtap.spec
 
 EXAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples
-EXAMPLE_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples
-DEMO_SOURCE_DIR = $(srcdir)/testsuite/systemtap.examples/small_demos
-DEMO_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/examples/small_demos
-SAMPLE_SOURCE_DIR = $(srcdir)/testsuite/systemtap.samples
-SAMPLE_INSTALL_DIR = $(EXAMPLE_INSTALL_DIR)/samples
-EXAMPLE_SRC = $(EXAMPLE_SOURCE_DIR)/ChangeLog \
-	$(EXAMPLE_SOURCE_DIR)/README \
-	$(EXAMPLE_SOURCE_DIR)/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/*.meta
-
-DEMO_SRC = \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.stp \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.txt \
-	$(EXAMPLE_SOURCE_DIR)/small_demos/*.wav
-
-SAMPLE_SRC = $(SAMPLE_SOURCE_DIR)/iotask.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-stacks.stp \
-	$(SAMPLE_SOURCE_DIR)/kmalloc-top \
-	$(SAMPLE_SOURCE_DIR)/pfaults.stp \
-	$(SAMPLE_SOURCE_DIR)/profile.stp \
-	$(SAMPLE_SOURCE_DIR)/tcp_connections.stp \
-	$(SAMPLE_SOURCE_DIR)/topsys.stp
-
+EXAMPLE_META_FILES = $(EXAMPLE_SOURCE_DIR)/*/*.meta
 TEST_COV_DIR = coverage
 # XXX: leaves behind man pages
 SUBDIRS = testsuite doc
@@ -1187,8 +1164,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
 
@@ -1213,8 +1190,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) \
@@ -1224,13 +1201,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
@@ -1303,6 +1279,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)
@@ -1330,6 +1310,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*) \
@@ -1391,7 +1373,6 @@ distcleancheck: distclean
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-@BUILD_CRASHMOD_FALSE@all-local:
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
@@ -1499,7 +1480,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 \
@@ -1570,10 +1551,19 @@ install-exec-hook:
 @BUILD_CRASHMOD_TRUE@$(STAPLOG): staplog.c
 @BUILD_CRASHMOD_TRUE@	$(CC) $(staplog_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -shared -rdynamic \
 @BUILD_CRASHMOD_TRUE@		$(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@ $<
-@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG)
+@BUILD_CRASHMOD_TRUE@all-local: $(STAPLOG) example_index
 @BUILD_CRASHMOD_TRUE@install-exec-local: $(STAPLOG)
 @BUILD_CRASHMOD_TRUE@	$(MKDIR_P) $(DESTDIR)$(pkglibdir)
 @BUILD_CRASHMOD_TRUE@	$(INSTALL) $(STAPLOG) $(DESTDIR)$(pkglibdir)
+@BUILD_CRASHMOD_FALSE@all-local: example_index
+
+example_index: $(EXAMPLE_SOURCE_DIR)/index.html
+
+$(EXAMPLE_SOURCE_DIR)/index.html: $(EXAMPLE_META_FILES) $(EXAMPLE_INDEX_GEN)
+	@echo "The script example index is outdated, run"
+	@echo "    cd $(EXAMPLE_SOURCE_DIR) && \\ "
+	@echo "    perl examples-index-gen.pl"
+	@echo "to regenerate it."
 
 dist-hook: dist-gitversion
 	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
@@ -1590,12 +1580,12 @@ install-data-local:
 		do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/uprobes/$$f; done)
 	(cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name README \) -print \
 		| while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done)
-	$(MKDIR_P) $(EXAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(EXAMPLE_SRC) $(EXAMPLE_INSTALL_DIR)
-	$(MKDIR_P) $(DEMO_INSTALL_DIR)
-	$(INSTALL_DATA) $(DEMO_SRC) $(DEMO_INSTALL_DIR)
-	$(MKDIR_P) $(SAMPLE_INSTALL_DIR)
-	$(INSTALL_DATA) $(SAMPLE_SRC) $(SAMPLE_INSTALL_DIR)
+	(cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \
+		| egrep -v 'check.exp|ChangeLog|examples-index-gen.pl' \
+		| while read f; do if test -x $$f; then \
+			i_cmd="$(INSTALL_PROGRAM)"; else \
+			i_cmd="$(INSTALL_DATA)"; fi; \
+			$$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -1636,28 +1626,9 @@ uninstall-local:
 
 check:
 	SRCDIR=`cd $(srcdir); pwd`; \
-	BUILDDIR=`cd $(builddir); pwd`; \
-	need_server=0; \
-	(echo "X$(EXTRA_TOOL_OPTS)" | grep -q server) && need_server=1; \
-	if test $$need_server = 1; then \
-	  echo "Testing using a systemtap server"; \
-	  need_server=0; \
-	  server_pid=`stap-find-or-start-server` || need_server=1; \
-	  if test $$need_server = 1; then \
-	      echo "Cannot find or start a systemtap server"; \
-	      exit -1; \
-	  fi; \
-	  client_path="$$BUILDDIR/testsuite/net"; \
-	  mkdir -p $$BUILDDIR/testsuite/net; \
-	  cp -p $$SRCDIR/stap-client $$BUILDDIR/testsuite/net/stap; \
-	fi; \
-	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH="$$client_path:$(PWD)" RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
-	if test "X$$server_pid" != "X"; then \
-	  stap-stop-server $$server_pid; \
-	fi
+	$(MAKE) -C testsuite check SYSTEMTAP_RUNTIME=$$SRCDIR/runtime SYSTEMTAP_TAPSET=$$SRCDIR/tapset LD_LIBRARY_PATH=$(PWD)/lib-elfutils:$(PWD)/lib-elfutils/systemtap SYSTEMTAP_PATH="$(PWD)" RUNTESTFLAGS="$(RUNTESTFLAGS)";
 
 installcheck:
-	BUILDDIR=`cd $(builddir); pwd`; \
 	if test \! -e $(DESTDIR)$(bindir)/stap; then \
 	  echo $(DESTDIR)$(bindir)/stap doesn\'t exist, run make install; \
 	  exit -1; \
@@ -1665,28 +1636,11 @@ installcheck:
 	if test $(builddir)/stap -nt $(DESTDIR)$(bindir)/stap; then \
 	  echo "$(DESTDIR)$(bindir)/stap is not recent, run make install"; \
 	  exit -1; \
-	fi; \
-	need_server=0; \
-	(echo "X$(EXTRA_TOOL_OPTS)" | grep -q server) && need_server=1; \
-	if test $$need_server = 1; then \
-	  echo "Testing using a systemtap server"; \
-	  need_server=0; \
-	  server_pid=`stap-find-or-start-server` || need_server=1; \
-	  if test $$need_server = 1; then \
-	      echo "Cannot find or start a systemtap server"; \
-	      exit -1; \
-	  fi; \
-	  client_path=":$$BUILDDIR/testsuite/net"; \
-	  mkdir -p $$BUILDDIR/testsuite/net; \
-	  cp -p $(DESTDIR)$(bindir)/stap-client $$BUILDDIR/testsuite/net/stap; \
-	fi; \
-	$(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" EXTRA_SYSTEMTAP_PATH="$(EXTRA_SYSTEMTAP_PATH)$$client_path"; \
-	if test "X$$server_pid" != "X"; then \
-	  stap-stop-server $$server_pid; \
-	fi
+	fi;
+	$(MAKE) -C testsuite installcheck RUNTESTFLAGS="$(RUNTESTFLAGS)" EXTRA_SYSTEMTAP_PATH="$(EXTRA_SYSTEMTAP_PATH)"
 
 rpm:	systemtap.spec dist
-	rpmbuild --define "_sourcedir $(PWD)/" -ba systemtap.spec
+	rpmbuild --define "_sourcedir $(PWD)/" -ba $(srcdir)/systemtap.spec
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: