Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

17 files changed, 12 insertions, 40 deletions

diff --git a/testsuite/semko/forty.stp b/testsuite/semko/forty.stp
index f7721a47..b7d1d139 100755
--- a/testsuite/semko/forty.stp
+++ b/testsuite/semko/forty.stp
@@ -1,4 +1,4 @@
 #! stap -p2
 
 global x
-probe kernel.function("sys_open") if (x = 1) { }  # bad side-effect
+probe kernel.function("do_sys_open") if (x = 1) { }  # bad side-effect
diff --git a/testsuite/semko/fortyone.stp b/testsuite/semko/fortyone.stp
index e9b986df..d3ba6205 100755
--- a/testsuite/semko/fortyone.stp
+++ b/testsuite/semko/fortyone.stp
@@ -1,3 +1,3 @@
 #! stap -p2
 
-probe kernel.function("sys_open") if (x > 1) { }  # not a global
+probe kernel.function("vfs_read") if (x > 1) { }  # not a global
diff --git a/testsuite/semko/fortytwo.stp b/testsuite/semko/fortytwo.stp
index 17dacb1c..09a04ea7 100755
--- a/testsuite/semko/fortytwo.stp
+++ b/testsuite/semko/fortytwo.stp
@@ -1,6 +1,6 @@
 #! stap -p2
 
-probe kernel.function("sys_open") if (foo(2)) { }  # must not call functions
+probe kernel.function("vfs_read") if (foo(2)) { }  # must not call functions
 
 function foo(x) { return x }
 
diff --git a/testsuite/semko/maxactive04.stp b/testsuite/semko/maxactive04.stp
index 9471fd21..25d63ef4 100755
--- a/testsuite/semko/maxactive04.stp
+++ b/testsuite/semko/maxactive04.stp
@@ -1,5 +1,5 @@
 #! stap -p2
 
-probe kernel.function("sys_open").return.maxactive(-4)
+probe kernel.function("vfs_read").return.maxactive(-4)
 {
 }
diff --git a/testsuite/semko/maxactive05.stp b/testsuite/semko/maxactive05.stp
index bdc8a101..3833ab6c 100755
--- a/testsuite/semko/maxactive05.stp
+++ b/testsuite/semko/maxactive05.stp
@@ -1,5 +1,5 @@
 #! stap -p2
 
-probe kernel.function("sys_open").return.maxactive(99999999)
+probe kernel.function("vfs_read").return.maxactive(99999999)
 {
 }
diff --git a/testsuite/semko/return02.stp b/testsuite/semko/return02.stp
index db4cd8c7..3d64f5dc 100755
--- a/testsuite/semko/return02.stp
+++ b/testsuite/semko/return02.stp
@@ -1,6 +1,6 @@
 #! stap -p2
 
-probe kernel.function("sys_read")
+probe kernel.function("vfs_read")
 {
     # this should fail - using $return not in a '.return' probe
     printf("in sys_read - return = %d\n", $return)
diff --git a/testsuite/semko/thirtyfour.stp b/testsuite/semko/thirtyfour.stp
index 515fcfbb..dca63722 100755
--- a/testsuite/semko/thirtyfour.stp
+++ b/testsuite/semko/thirtyfour.stp
@@ -2,9 +2,9 @@
 
 # can't write to target variables in .return probes
 
-probe kernel.function("sys_read").return
+probe kernel.function("fget_light").return
 {
     $fd = 0
     printf("fd is %d\n", $fd)
 }
-probe kernel.function("sys_open").return { $filename }
+probe kernel.function("do_sys_open").return { $filename }
diff --git a/testsuite/semko/twentytwo.stp b/testsuite/semko/twentytwo.stp
index 9321d5f6..ef04cd30 100755
--- a/testsuite/semko/twentytwo.stp
+++ b/testsuite/semko/twentytwo.stp
@@ -3,6 +3,6 @@
 # tests that a non-inline function is *not* matched using
 # the inline() pattern
 
-probe kernel.function("sys_recv").inline {
+probe kernel.function("vfs_read").inline {
   log ("found a non-inline via inline()")
 }
diff --git a/testsuite/semko/utrace01.stp b/testsuite/semko/utrace01.stp
deleted file mode 100755
index a4707008..00000000
--- a/testsuite/semko/utrace01.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# missing process NAME|PID
-probe process.death { }
diff --git a/testsuite/semko/utrace03.stp b/testsuite/semko/utrace03.stp
index c682410b..92177ffd 100755
--- a/testsuite/semko/utrace03.stp
+++ b/testsuite/semko/utrace03.stp
@@ -1,4 +1,4 @@
 #! stap -p2
 
 # invalid probe type
-probe process("/bin/cat").death.return { }
+probe process("/bin/cat").end.return { }
diff --git a/testsuite/semko/utrace04.stp b/testsuite/semko/utrace04.stp
index 6345f9f6..1d26a43c 100755
--- a/testsuite/semko/utrace04.stp
+++ b/testsuite/semko/utrace04.stp
@@ -1,4 +1,4 @@
 #! stap -p2
 
-# death probes don't support target symbols
-probe process("/bin/cat").death.return { print($syscall) }
+# end probes don't support target symbols
+probe process("/bin/cat").end { print($syscall) }
diff --git a/testsuite/semko/utrace08.stp b/testsuite/semko/utrace08.stp
deleted file mode 100755
index a558a5be..00000000
--- a/testsuite/semko/utrace08.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# process path must be absolute
-probe process("cat").death { }
diff --git a/testsuite/semko/utrace09.stp b/testsuite/semko/utrace09.stp
deleted file mode 100755
index 60c49cd2..00000000
--- a/testsuite/semko/utrace09.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# process path must be absolute
-probe process("/foo/../bar").death { }
diff --git a/testsuite/semko/utrace10.stp b/testsuite/semko/utrace10.stp
deleted file mode 100755
index b46baea9..00000000
--- a/testsuite/semko/utrace10.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# path can't contain an empty component
-probe process("/foo//bar").death { }
diff --git a/testsuite/semko/utrace11.stp b/testsuite/semko/utrace11.stp
deleted file mode 100755
index d78b602c..00000000
--- a/testsuite/semko/utrace11.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# path can't end with '/'
-probe process("/foo/bar/").death { }
diff --git a/testsuite/semko/utrace12.stp b/testsuite/semko/utrace12.stp
deleted file mode 100755
index 478aa1d3..00000000
--- a/testsuite/semko/utrace12.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# path can't end with '.'
-probe process("/foo/bar/.").death { }
diff --git a/testsuite/semko/utrace13.stp b/testsuite/semko/utrace13.stp
deleted file mode 100755
index 16cc0391..00000000
--- a/testsuite/semko/utrace13.stp
+++ /dev/null
@@ -1,4 +0,0 @@
-#! stap -p2
-
-# path can't end with '..'
-probe process("/foo/bar/..").death { }