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, 7 insertions, 11 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index 48947a60..a321b4e8 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -853,9 +853,10 @@ struct dwflpp
 
     // 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 '" << prefixed_pattern << "' "
 	   << "matches "
@@ -1299,7 +1300,7 @@ struct dwflpp
 
     // 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;
 
     dwarf_assert ("dwarf_getsrcfiles",
 		  dwarf_getsrcfiles (cu, &srcfiles, &nfiles));
@@ -1307,7 +1308,8 @@ struct dwflpp
     for (size_t i = 0; i < nfiles; ++i)
       {
 	char const * fname = dwarf_filesrc (srcfiles, i, NULL, NULL);
-	if (fnmatch (prefixed_pattern.c_str(), fname, 0) == 0)
+	if (fnmatch (pattern.c_str(), fname, 0) == 0 ||
+            fnmatch (prefixed_pattern.c_str(), fname, 0) == 0)
 	  {
 	    filtered_srcfiles.insert (fname);
 	    if (sess.verbose>2)
@@ -6310,13 +6312,7 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
       s.op->newline() << "case UDPF_SYSCALL:";
       s.op->newline() << "case UDPF_SYSCALL_RETURN:";
       s.op->indent(1);
-      s.op->newline() << "engine = utrace_attach(tsk, UTRACE_ATTACH_MATCH_OPS, &p->ops, 0);";
-      s.op->newline() << "if (! IS_ERR(engine) && engine != NULL) {";
-      s.op->indent(1);
-      s.op->newline() << "utrace_detach(tsk, engine);";
-      s.op->newline() << "debug_task_finder_detach();";
-
-      s.op->newline(-1) << "}";
+      s.op->newline() << "stap_utrace_detach(tsk, &p->ops);";
       s.op->newline() << "break;";
       s.op->indent(-1);
     }