Merge pull request #2016 from ferd/maint

Update and fix systemtap trace example scripts

1 files changed, 19 insertions, 25 deletions

diff --git a/lib/runtime_tools/examples/driver1.systemtap b/lib/runtime_tools/examples/driver1.systemtap
index e1ee8ecffc..f5bc28b42d 100644
--- a/lib/runtime_tools/examples/driver1.systemtap
+++ b/lib/runtime_tools/examples/driver1.systemtap
@@ -19,108 +19,102 @@
  * %CopyrightEnd%
  */
 /*
- * Note: This file assumes that you're using the non-SMP-enabled Erlang
- *       virtual machine, "beam".  The SMP-enabled VM is called "beam.smp".
+ * Note: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "beam.smp".
  *       Note that other variations of the virtual machine also have
  *       different names, e.g. the debug build of the SMP-enabled VM
  *       is "beam.debug.smp".
  *
  *       To use a different virtual machine, replace each instance of
- *       "beam" with "beam.smp" or the VM name appropriate to your
- *       environment.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("driver-init")
+probe process("beam.smp").mark("driver__init")
 {
     printf("driver init name %s major %d minor %d flags %d\n",
 	   user_string($arg1), $arg2, $arg3, $arg4);
 }
 
-probe process("beam").mark("driver-start")
+probe process("beam.smp").mark("driver__start")
 {
     printf("driver start pid %s driver name %s port %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-stop")
+probe process("beam.smp").mark("driver__stop")
 {
     printf("driver stop pid %s driver name %s port %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-finish")
+probe process("beam.smp").mark("driver__finish")
 {
     printf("driver finish driver name %s\n",
            user_string($arg1));
 }
 
-probe process("beam").mark("driver-flush")
+probe process("beam.smp").mark("driver__flush")
 {
     printf("driver flush pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-output")
+probe process("beam.smp").mark("driver__output")
 {
     printf("driver output pid %s port %s port name %s bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("driver-outputv")
+probe process("beam.smp").mark("driver__outputv")
 {
     printf("driver outputv pid %s port %s port name %s bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("driver-control")
+probe process("beam.smp").mark("driver__control")
 {
     printf("driver control pid %s port %s port name %s command %d bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4, $arg5);
 }
 
-probe process("beam").mark("driver-call")
+probe process("beam.smp").mark("driver__call")
 {
     printf("driver call pid %s port %s port name %s command %d bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4, $arg5);
 }
 
-probe process("beam").mark("driver-event")
-{
-    printf("driver event pid %s port %s port name %s\n",
-	   user_string($arg1), user_string($arg2), user_string($arg3));
-}
-
-probe process("beam").mark("driver-ready_input")
+probe process("beam.smp").mark("driver__ready_input")
 {
     printf("driver ready_input pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-ready_output")
+probe process("beam.smp").mark("driver__ready_output")
 {
     printf("driver ready_output pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-timeout")
+probe process("beam.smp").mark("driver__timeout")
 {
     printf("driver timeout pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-ready_async")
+probe process("beam.smp").mark("driver__ready_async")
 {
     printf("driver ready_async pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-process_exit")
+probe process("beam.smp").mark("driver__process_exit")
 {
     printf("driver process_exit pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-stop_select")
+probe process("beam.smp").mark("driver__stop_select")
 {
     printf("driver stop_select driver name %s\n", user_string($arg1));
 }