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

10 files changed, 71 insertions, 3 deletions

diff --git a/testsuite/semko/target_addr1.stp b/testsuite/semko/target_addr1.stp
new file mode 100755
index 00000000..cac3aab2
--- /dev/null
+++ b/testsuite/semko/target_addr1.stp
@@ -0,0 +1,6 @@
+#! stap -p2
+
+// can't take the address of bitfields
+probe kernel.function("release_task") {
+    println(& $p->did_exec)  // unsigned:1
+}
diff --git a/testsuite/semko/target_addr2.stp b/testsuite/semko/target_addr2.stp
new file mode 100755
index 00000000..36133e3e
--- /dev/null
+++ b/testsuite/semko/target_addr2.stp
@@ -0,0 +1,6 @@
+#! stap -p2
+
+// can't take the address of register parameters
+probe kernel.function("do_sys_open") {
+    println(& $dfd)
+}
diff --git a/testsuite/semko/target_addr3.stp b/testsuite/semko/target_addr3.stp
new file mode 100755
index 00000000..fe072adb
--- /dev/null
+++ b/testsuite/semko/target_addr3.stp
@@ -0,0 +1,6 @@
+#! stap -p2
+
+// can't take the address of register return values
+probe kernel.function("do_sys_open").return {
+    println(& $return)
+}
diff --git a/testsuite/semok/target_addr.stp b/testsuite/semok/target_addr.stp
new file mode 100755
index 00000000..dfbc2606
--- /dev/null
+++ b/testsuite/semok/target_addr.stp
@@ -0,0 +1,11 @@
+#! stap -p2
+
+// read the address of various task_struct members.
+// all should roughly be $p + offsetof(foo)
+probe kernel.function("release_task") {
+    println(& $p->state)  // long
+    println(& $p->usage)  // atomic_t
+    println(& $p->comm)   // comm[TASK_COMM_LEN]
+    println(& $p->comm[1])
+    println(& $p->parent) // task_struct*
+}
diff --git a/testsuite/systemtap.base/cast.exp b/testsuite/systemtap.base/cast.exp
index 374132f0..38ef67b9 100644
--- a/testsuite/systemtap.base/cast.exp
+++ b/testsuite/systemtap.base/cast.exp
@@ -2,5 +2,6 @@ set test "cast"
 set ::result_string {PID OK
 PID2 OK
 execname OK
-sa_data OK}
+sa_data OK
+usage OK}
 stap_run2 $srcdir/$subdir/$test.stp -g
diff --git a/testsuite/systemtap.base/cast.stp b/testsuite/systemtap.base/cast.stp
index e2505000..bb889bb8 100644
--- a/testsuite/systemtap.base/cast.stp
+++ b/testsuite/systemtap.base/cast.stp
@@ -33,6 +33,15 @@ probe begin
     else
         printf("sa_data %d != %d\n", data, cast_data)
 
+    // Compare usage counter values through a struct address
+    usage = @cast(curr, "task_struct")->usage->counter
+    pusage = & @cast(curr, "task_struct")->usage
+    cast_usage = @cast(pusage, "atomic_t")->counter
+    if (usage == cast_usage)
+        println("usage OK")
+    else
+        printf("usage %d != %d\n", usage, cast_usage)
+
     exit()
 }
 
diff --git a/testsuite/systemtap.base/pointer_array.exp b/testsuite/systemtap.base/pointer_array.exp
new file mode 100644
index 00000000..0e3af213
--- /dev/null
+++ b/testsuite/systemtap.base/pointer_array.exp
@@ -0,0 +1,13 @@
+set test "pointer_array"
+set ::result_string {/bin/true
+/
+b
+i
+n
+/
+t
+r
+u
+e
+0}
+stap_run2 $srcdir/$subdir/$test.stp -c/bin/true
diff --git a/testsuite/systemtap.base/pointer_array.stp b/testsuite/systemtap.base/pointer_array.stp
new file mode 100644
index 00000000..1d15ebf4
--- /dev/null
+++ b/testsuite/systemtap.base/pointer_array.stp
@@ -0,0 +1,16 @@
+probe syscall.execve
+{
+    if (pid() == target()) {
+        println(user_string($argv[0]))
+        printf("%c\n", $argv[0][0])
+        printf("%c\n", $argv[0][1])
+        printf("%c\n", $argv[0][2])
+        printf("%c\n", $argv[0][3])
+        printf("%c\n", $argv[0][4])
+        printf("%c\n", $argv[0][5])
+        printf("%c\n", $argv[0][6])
+        printf("%c\n", $argv[0][7])
+        printf("%c\n", $argv[0][8])
+        println($argv[0][9])
+    }
+}
diff --git a/testsuite/systemtap.base/utrace_syscall_args.stp b/testsuite/systemtap.base/utrace_syscall_args.stp
index 6c9e14fc..5c6ca451 100644
--- a/testsuite/systemtap.base/utrace_syscall_args.stp
+++ b/testsuite/systemtap.base/utrace_syscall_args.stp
@@ -36,7 +36,7 @@ probe begin
 }
 
 probe syscall.open {
-      if (filename == "foobar") {
+      if (pid() == target() && filename == "foobar") {
       	 syscalls_seen += 1
       }
 }
diff --git a/testsuite/systemtap.exelib/exelib.exp b/testsuite/systemtap.exelib/exelib.exp
index c4ca8fc0..bd9c687e 100644
--- a/testsuite/systemtap.exelib/exelib.exp
+++ b/testsuite/systemtap.exelib/exelib.exp
@@ -48,7 +48,7 @@ foreach arch $arches {
 	# Adding -O, -O2, -Os and mixing lib/exe is a bit overdone
 	foreach opt {-O0 -O3} {
 	    
-	    foreach libprelink {no yes} { # BUG! "yes" breaks ustack PR10323
+	    foreach libprelink {no yes} {
 		
 		# not done yet, "no" lib debug.
 		# seperate debuginfo can be done before or after prelinking