4 files changed, 23 insertions, 16 deletions

diff --git a/examples/small_demos/proc_snoop.stp b/examples/small_demos/proc_snoop.stp
index c7517496..5b46d343 100755
--- a/examples/small_demos/proc_snoop.stp
+++ b/examples/small_demos/proc_snoop.stp
@@ -30,7 +30,7 @@ probe process.exec {
     report(sprintf("exec %s", filename))
 }
 
-probe process.exec.complete {
+probe process.exec_complete {
     if (success)
         report("exec success")
     else
@@ -45,13 +45,13 @@ probe process.release {
     report(sprintf("remove %s", id(task)))
 }
 
-probe process.signal.send {
+probe process.signal_send {
     report(sprintf("sigsend %d (%s) to %s%s", signal, signal_name, id(task),
                 shared? " [SHARED]" : ""))
 }
 
 /* FIXME this probepoint is not fully implemented
-probe process.signal.handle {
+probe process.signal_handle {
     report(sprintf("sighandle %d (%s)", signal, signal_name))
 }
 */
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index ffb035b8..c7538cd6 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-17  Josh Stone  <joshua.i.stone@intel.com>
+
+	* process.stp: Rename signal.send to signal_send and process.complete
+	to process_complete, to allow process.* to work properly.
+	* process.stp (_IS_ERR): declare parameter type
+	* process.stp (process.create): correct new_pid assignment
+
 2006-05-16  David Smith  <dsmith@redhat.com>
 
 	* conversions.stp (hexstring, string): Removed functions.  Because
diff --git a/tapset/process.stp b/tapset/process.stp
index 3c8f299d..d08b10e2 100644
--- a/tapset/process.stp
+++ b/tapset/process.stp
@@ -7,7 +7,7 @@
 // later version.
 
 
-function _IS_ERR:long(ptr) %{
+function _IS_ERR:long(ptr:long) %{
     THIS->__retvalue = IS_ERR((const void *)(long)THIS->ptr);
 %}
 
@@ -25,7 +25,7 @@ function _IS_ERR:long(ptr) %{
  */
 probe process.create = kernel.function("copy_process").return {
     task = retval()
-    new_pid = $pid
+    new_pid = task_pid(task)
     if (_IS_ERR(task)) next
 }
 
@@ -63,7 +63,7 @@ probe process.exec =
 }
 
 
-/* probe process.exec.complete
+/* probe process.exec_complete
  *
  *  Fires at the completion of an exec call.
  *
@@ -75,7 +75,7 @@ probe process.exec =
  *  errno - the error number resulting from the exec
  *  success - a boolean indicating whether the exec was successful
  */
-probe process.exec.complete =
+probe process.exec_complete =
 /*
     kernel.function("do_execve").return
 %( arch != "i586" %? %( arch != "i686" %? 
@@ -124,7 +124,7 @@ probe process.release = kernel.function("release_task") {
 }
 
 
-/* probe process.signal.send
+/* probe process.signal_send
  *
  *  Fires when a process sends a signal to another process.  This does not
  *  include ignored signals.
@@ -138,12 +138,12 @@ probe process.release = kernel.function("release_task") {
  *  task - a task handle to the signal recipient
  *  shared - indicates whether this signal is shared by the thread group
  */
-probe process.signal.send = _process.signal.send.* {
+probe process.signal_send = _process.signal_send.* {
     signal = $sig
     signal_name = _signal_name($sig)
 }
 
-probe _process.signal.send.part1 =
+probe _process.signal_send.part1 =
         kernel.function("__group_send_sig_info"),
         kernel.function("send_group_sigqueue")
 {
@@ -151,14 +151,14 @@ probe _process.signal.send.part1 =
     shared = 1
 }
 
-probe _process.signal.send.part2 =
+probe _process.signal_send.part2 =
         kernel.function("send_sigqueue")
 {
     task = $p
     shared = 0
 }
 
-probe _process.signal.send.part3 =
+probe _process.signal_send.part3 =
         kernel.function("specific_send_sig_info")
 {
     task = $t
@@ -166,7 +166,7 @@ probe _process.signal.send.part3 =
 }
 
 
-/* probe process.signal.handle
+/* probe process.signal_handle
  *
  *  Fires when a process handles a signal.
  *
@@ -181,7 +181,7 @@ probe _process.signal.send.part3 =
  * compiler.  On FC5 it is inlined, but on RHEL4 it is not.  Until we have a
  * nice way for tapsets to specify "possibly inlined", we can't include this
  * probe point.
-probe process.signal.handle = kernel.function("handle_signal") {
+probe process.signal_handle = kernel.function("handle_signal") {
     signal = $sig
     signal_name = _signal_name($sig)
 }
diff --git a/testsuite/buildok/process_test.stp b/testsuite/buildok/process_test.stp
index 8da45378..df2a4a64 100755
--- a/testsuite/buildok/process_test.stp
+++ b/testsuite/buildok/process_test.stp
@@ -14,7 +14,7 @@ probe process.exec {
   log(filename)
 }
 
-probe process.exec.complete {
+probe process.exec_complete {
   log(pp())
   log(sprint(errno))
   log(sprint(success))
@@ -30,7 +30,7 @@ probe process.release {
   log(sprint(task))
 }
 
-probe process.signal.send {
+probe process.signal_send {
   log(pp())
   log(sprint(signal))
   log(signal_name)