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.
  ...

diff --cc ChangeLog
index f0a2307d0d2d51720cee083026cb64ac3614c813,9b59e6e597361055fee641bfe4a122e48c6a8683..4bcf573674f7349bb9c70e0402206499283eccdd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,113 +1,125 @@@
 -      PR5049
+ 2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
+ 
+       PR5049
+       * tapsets.cxx (cu_name_matches, collect_srcfiles_matching):
+       Implicitly but optionally prefix probe source filenames with "*/".
+       * stapprobes.5.in: Document this.
+ 
+ 2008-08-11  Dave Brolley  <brolley@redhat.com>
+ 
+       * stap-client (disconnect_from_server): Call after receive_response.
+       * stap-server (stap_rc): Renamed from 'rc'. Don't use it as an exit
+       code.
+       * stap-serverd (listen): Set pipefail so that we get the rc of nc
+       if it fails. Make multiple attempts to establish a server.
+       (fatal): Call 'terminate'.
+ 
  2008-08-11  Frank Ch. Eigler  <fche@elastic.org>
  
        PR5049
        * tapsets.cxx (cu_name_matches, collect_srcfiles_matching):
        Implicitly prefix probe source filenames with "*".
  
- 2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
+ 2008-08-11  David Smith  <dsmith@redhat.com>
+ 
+       * tapsets.cxx (utrace_builder::build): Fixed indentation.
  
-       * main.cxx (main): Don't override $PATH etc.
-       * tapsets.cxx (base_query ctor, dwarf_builder::build,
-       itrace_builder, utrace_derived_probe): Use find_executable()
-       to resolve FOO path in process("FOO").
-       * util.cxx (find_executable): Duplicate execvp logic.
+ 2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
+ 
+       * Makefile.am (install-data-local): Use INSTALL_PROGRAM for executable
+       stp scripts.
+       * Makefile.in: Regenerated.
+ 
++2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
++       
++       * main.cxx (main): Don't override $PATH etc.
++       * tapsets.cxx (base_query ctor, dwarf_builder::build,
++       itrace_builder, utrace_derived_probe): Use find_executable()
++       to resolve FOO path in process("FOO").
++       * util.cxx (find_executable): Duplicate execvp logic.
 +
 +2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
 +
 +      * util.cxx (find_executable): Reorganize, simplify, canonicalize.
 +      * util.h, hash.cxx: Corresponding changes.
++      
+ 2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
+ 
+       * Makefile.am (example index): Only warn and instruct on index
+       regeneration.  Do not actually perform it as the source tree
+       should be considered (and can really be) read-only.
+       * Makefile.in: Regenerated.
+ 
+ 2008-08-08  Dave Brolley  <brolley@redhat.com>
+ 
+       * stap-client: Use quotes when echoing. Exit with $rc.
+       (initialization): Initialize 'rc'.
+       (parse_options): Manage the command line in three pieces:
+       pre-script name, script name, post-script name.
+       (process_*): Likewise.
+       (send_request): Redirect stdout of 'nc' to /dev/null.
+       (receive_response): Handle "failed:" response. Redirect stdin of 'nc'
+       from /dev/zero.
+       (maybe_call_staprun): Check $rc. Check the requested phase limit
+       before looking for the module.
+       * stap-server: Use quotes when echoing. Exit with $rc.
+       (initialization): Initialize 'rc'.
+       (receive_request): Start 'nc' in the background before sending the
+       "ready:" message. Redirect stdin of 'nc' from /dev/zero.
+       (read_data_file): Allow for multiple lines of data.
+       (call_stap): Quoet $cmdline. Set 'rc'.
+       (send_response): Send "failed:" if stap is unsuccessful. Start 'nc'
+       in the background before sending the response.
+       (cleanup): Kill any running 'nc' job.
+       (terminate): Exit with $rc.
+       * stap-serverd: Start the server before advertising our presence.
+       * stap-find-or-start-server: Echo 0 if a server is already running.
+       Echo -1 if no server is running and one can't be started.
+       * stap-start-server: Wait until the server starts before exiting. Exit
+       with 1 if the server does not start.
+       * systemtap.spec: Move client side script to the runtime sub package.
+       The main package and the runtime sub package both depend on avahi-tools
+       and nc.
+       * Makefile.am: Revert previous changes. Now done in
+       testsuite/lib/systemtap.exp.
+       * Makefile.in: Regenerated.
+ 
+ 2008-08-08  David Smith  <dsmith@redhat.com>
+ 
+       * tapsets.cxx (utrace_derived_probe_group::emit_module_decls):
+       Calls stap_utrace_detach() to perform detach.
+ 
+ 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+ 
+       * Makefile.am (EXAMPLE_BUILD_DIR): Removed. Examples indexes are
+       always in srcdir.
+       (dist-hook): Always install examples from srcdir.
+       * Makefile.in: Regenerated.
+ 
+ 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+ 
+       * Makefile.am (rpm): Refer to srcdir spec file so make rpm works in
+       builddir.
+       * Makefile.in: Regenerated.
+ 
+ 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+ 
+       * systemtap.spec: Disable chmodding of samples/kmalloc-top.
+       It is currently not installed.
+ 
+ 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+ 
+       * Makefile.am (all-local): Depend on example_index, which now
+       doesn't generate anything in $srcdir anymore, only $builddir.
+       (EXAMPLE_SOURCE_DIR): New var.
+       (EXAMPLE_BUILD_DIR): New var.
+       (EXAMPLE_META_FILES): New var.
+       (EXAMPLE_INDEX_GEN): New var.
+       (example_index): New target.
+       ($EXAMPLE_BUILD_DIR/index.html): Likewise.
+       (install-data-local): Install examples from $buildir.
+       * Makefile.in: Regenerated.
+       * aclocal.m4: Likewise.
  
  2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
  

diff --cc runtime/task_finder.c
Simple merge

diff --cc tapsets.cxx
index 48947a6011a5a9400612bcbfd70a4fc584b8dd14,af9fda5241961d4079e913bdbb5d1b0274d407ff..a321b4e84b4b9d9cf6a75c4a4a2c78303d365662
--- 1/tapsets.cxx
--- 2/tapsets.cxx
+++ b/tapsets.cxx
@@@ -853,11 -858,12 +853,12 @@@ struct dwflp
  
      // PR 5049: implicit * in front of given path pattern.
      // NB: fnmatch() is used without FNM_PATHNAME.
-     string prefixed_pattern = string("*") + pattern;
+     string prefixed_pattern = string("*/") + pattern;
  
-     bool t = (fnmatch(prefixed_pattern.c_str(), cu_name.c_str(), 0) == 0);
+     bool t = (fnmatch(pattern.c_str(), cu_name.c_str(), 0) == 0 ||
+               fnmatch(prefixed_pattern.c_str(), cu_name.c_str(), 0) == 0);
      if (t && sess.verbose>3)
 -      clog << "pattern '" << pattern << "' "
 +      clog << "pattern '" << prefixed_pattern << "' "
           << "matches "
           << "CU '" << cu_name << "'" << "\n";
      return t;