Merge branch 'master' of git://sources.redhat.com/git/systemtap

10 files changed, 171 insertions, 5 deletions

diff --git a/dtrace b/dtrace
index cdc97c57..0c7711dc 100755
--- a/dtrace
+++ b/dtrace
@@ -166,6 +166,8 @@ if (filename == ""):
     else:
         usage
         sys.exit(1)
+else:
+    (filename,ext) = os.path.splitext(filename)
 
 if (build_header):
     providers = provider()
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 61627e16..5991d1a1 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2316,7 +2316,7 @@ dwflpp::get_blacklist_section(Dwarf_Addr addr)
     {
       Elf_Scn* scn = 0;
       size_t shstrndx;
-      dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx));
+      dwfl_assert ("getshdrstrndx", elf_getshdrstrndx (elf, &shstrndx));
       while ((scn = elf_nextscn (elf, scn)) != NULL)
         {
           GElf_Shdr shdr_mem;
diff --git a/dwflpp.h b/dwflpp.h
index 9cd2cb59..ec2fc2b9 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -25,6 +25,16 @@
 
 extern "C" {
 #include <elfutils/libdwfl.h>
+#ifdef HAVE_ELFUTILS_VERSION_H
+  #include <elfutils/version.h>
+  #if !_ELFUTILS_PREREQ(0,142)
+    // Always use newer name, old name is deprecated in 0.142.
+    #define elf_getshdrstrndx elf_getshstrndx
+  #endif
+#else
+  // Really old elfutils version, definitely redefine to use old name.
+  #define elf_getshdrstrndx elf_getshstrndx
+#endif
 #include <regex.h>
 }
 
diff --git a/tapset/string.stp b/tapset/string.stp
index cc842929..4b0a2a0d 100644
--- a/tapset/string.stp
+++ b/tapset/string.stp
@@ -98,6 +98,37 @@ function tokenize:string(input:string, delim:string)
 	}
 %}
 
+/** @addtogroup library
+ * @code str_replace:string (prnt_str:string, srch_str:string, rplc_str:string) @endcode
+ * @param prnt_str The parent string.
+ * @param srch_str The substring which is used to search in the parent string prnt_str.
+ * @param rplc_str The substring which is used to replace the searched string srch_str.
+ * @return Returns the parent string with substrings replaced. Else returns parent string.
+ */
+function str_replace:string (prnt_str:string, srch_str:string, rplc_str:string)
+%{
+	char *ptr = THIS->prnt_str;
+	char *ptr_base = THIS->prnt_str;
+	int strlen_srch_str = strlen(THIS->srch_str);
+
+	if(strlen_srch_str == 0) {
+		strlcat(THIS->__retvalue, ptr_base, MAXSTRINGLEN);
+		return;
+	}
+
+	while((ptr = strstr(ptr, THIS->srch_str)) != NULL) {
+
+		*ptr = '\0';
+		strlcat(THIS->__retvalue, ptr_base, MAXSTRINGLEN);
+		strlcat(THIS->__retvalue, THIS->rplc_str, MAXSTRINGLEN);
+		ptr = ptr + strlen_srch_str;
+		ptr_base = ptr;
+	}
+
+	strlcat(THIS->__retvalue, ptr_base, MAXSTRINGLEN);
+	return;
+%}
+
 /*
  * strtol - Convert a string to a long
  *   str   String to convert
diff --git a/tapsets.cxx b/tapsets.cxx
index 694905d9..3017e203 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -702,7 +702,7 @@ dwarf_builder::probe_table::probe_table(string& mark_name, systemtap_session & s
   elf = dwfl_module_getelf (dw->module, &bias);
   Elf_Scn *probe_scn = NULL;
 
-  dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx));
+  dwfl_assert ("getshdrstrndx", elf_getshdrstrndx (elf, &shstrndx));
 
   have_probes = false;
   
@@ -726,7 +726,7 @@ dwarf_builder::probe_table::probe_table(string& mark_name, systemtap_session & s
       elf = dwarf_getelf (dwfl_module_getdwarf (dw->module, &bias));
       if (! elf)
 	return;
-      dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx));
+      dwfl_assert ("getshdrstrndx", elf_getshdrstrndx (elf, &shstrndx));
       probe_scn = NULL;
       while ((probe_scn = elf_nextscn (elf, probe_scn)))
 	{
@@ -3707,7 +3707,7 @@ symbol_table::prepare_section_rejection(Dwfl_Module *mod)
 
   if (!elf)
     return;
-  if (elf_getshstrndx(elf, &shstrndx) != 0)
+  if (elf_getshdrstrndx (elf, &shstrndx) != 0)
     return;
   while ((scn = elf_nextscn(elf, scn)) != NULL)
     {
diff --git a/testsuite/systemtap.base/target_set.exp b/testsuite/systemtap.base/target_set.exp
new file mode 100644
index 00000000..4b6e0a5d
--- /dev/null
+++ b/testsuite/systemtap.base/target_set.exp
@@ -0,0 +1,68 @@
+# Test for target_set tapset
+
+set test target_set
+
+if {![installtest_p]} { untested $test; continue }
+
+set file $srcdir/$subdir/target_set.stp
+set time 12345
+set stap_cmd  "( ( /bin/sleep $time ) ; ( /bin/sleep $time ) ; ( /bin/sleep $time ) )"
+set stap_cmd_sleep_count 3
+set stap_cmd_child_level 3
+
+proc failtest {} {
+	global test
+	fail $test
+}
+
+proc expect_target_set_string {} {
+	expect {
+		"^target set:\r\n" { }
+		timeout { failtest; return -code return }
+	}
+}
+
+proc expect_target_set_pids generations {
+	global test
+	global stp_pid
+	for {set i 0} {$i < $generations} {incr i} {
+		expect {
+			-re {^([0-9]+) begat ([0-9]+)\r\n} { set pid_array($expect_out(1,string)) $expect_out(2,string) }
+			timeout { failtest; return -code return }
+		}
+	}
+	set pid_it $stp_pid
+	while {[info exists pid_array($pid_it)]} {
+		if {[exec pgrep -P $pid_it] != $pid_array($pid_it)} {
+			failtest; return -code return
+		}
+		set pid_it $pid_array($pid_it)
+	}
+	if {$generations > 1} {
+		exec kill -INT $pid_it
+	}
+}
+
+spawn stap $file $time -c "$stap_cmd"
+
+expect {
+	-timeout 180
+	-re {^(\d+)\r\n} { set stp_pid $expect_out(1,string) }
+	timeout { failtest; return }
+}
+
+expect_target_set_pids 1
+for {set i 0} {$i < $stap_cmd_sleep_count} {incr i} {
+	expect_target_set_string
+	expect_target_set_pids $stap_cmd_child_level
+}
+expect_target_set_string
+expect_target_set_pids 0
+
+expect {
+	eof {}
+	timeout { failtest; return }
+}
+
+wait
+pass $test
diff --git a/testsuite/systemtap.base/target_set.stp b/testsuite/systemtap.base/target_set.stp
new file mode 100644
index 00000000..002ba897
--- /dev/null
+++ b/testsuite/systemtap.base/target_set.stp
@@ -0,0 +1,16 @@
+probe begin
+{
+	stp_pid = stp_pid()
+	printf("%d\n%d begat %d\n", stp_pid, stp_pid, target())
+}
+
+probe syscall.nanosleep, syscall.compat_nanosleep ?
+{
+	if (target_set_pid(pid()) && $rqtp->tv_sec == $1)
+		target_set_report()
+}
+
+probe end
+{
+	target_set_report()
+}
diff --git a/testsuite/systemtap.examples/process/forktracker.meta b/testsuite/systemtap.examples/process/forktracker.meta
index f3ef3709..87d43d7a 100644
--- a/testsuite/systemtap.examples/process/forktracker.meta
+++ b/testsuite/systemtap.examples/process/forktracker.meta
@@ -10,4 +10,4 @@ output: trace
 scope: system-wide
 description: The forktracker.stp script prints out a time-stamped entry showing each fork and exec operation on the machine. This can be useful for determine what process is creating a flurry of short-lived processes.
 test_check: stap -p4 forktracker.stp
-test_installcheck: stap forkracker.stp -c "sleep 1"
+test_installcheck: stap forktracker.stp -c "sleep 1"
diff --git a/testsuite/systemtap.string/str_replace.exp b/testsuite/systemtap.string/str_replace.exp
new file mode 100644
index 00000000..4eedf1c6
--- /dev/null
+++ b/testsuite/systemtap.string/str_replace.exp
@@ -0,0 +1,14 @@
+set test "str_replace"
+
+set ::result_string {Result = hello pointer tap
+Result = pointer system tap
+Result = hello system pointer
+Result = Here I am, on the bored again. there I am, up on the stage, Here I go, playing star again. There I go, turn the page.- Bob Sege
+Result = here I am, on the road again. there I am, up on the stage, here I go, playing star again. There I go, turn the page.- Bob Seger
+Result = Here I am, on the road again. there I am, up on the stage, Here I go, playing star again. There I go, turn the page.- Metallica
+Result = hello  tap
+Result = hello system tap
+Result = 
+Result = }
+stap_run2 $srcdir/$subdir/$test.stp
+
diff --git a/testsuite/systemtap.string/str_replace.stp b/testsuite/systemtap.string/str_replace.stp
new file mode 100644
index 00000000..87e09353
--- /dev/null
+++ b/testsuite/systemtap.string/str_replace.stp
@@ -0,0 +1,25 @@
+# Test of str_replace() 
+
+global	long_str1 = "hello system tap"
+global	long_str2 = "Here I am, on the road again. there I am, up on the stage, Here I go, playing star again. There I go, turn the page.- Bob Seger"
+global	long_src_str1 = "system"
+global	long_src_str2 = "hello"
+global	long_src_str3 = "tap"
+global	long_rlpc_str = "pointer"
+
+probe begin {
+	printf("Result = %s\n",str_replace(long_str1, long_src_str1, long_rlpc_str))
+	printf("Result = %s\n",str_replace(long_str1, long_src_str2, long_rlpc_str))
+	printf("Result = %s\n",str_replace(long_str1, long_src_str3, long_rlpc_str))
+
+	printf("Result = %s\n",str_replace(long_str2, "road", "bored"))
+	printf("Result = %s\n",str_replace(long_str2, "Here", "here"))
+	printf("Result = %s\n",str_replace(long_str2, "Bob Seger", "Metallica"))
+	printf("Result = %s\n",str_replace(long_str1, long_src_str1, "\0"))
+	printf("Result = %s\n",str_replace(long_str1, "\0", long_rlpc_str))
+	printf("Result = %s\n",str_replace("\0", "\0", long_rlpc_str))
+	printf("Result = %s\n",str_replace("\0", "\0", "\0"))
+}
+probe begin {
+	exit()
+}