svn commit: r277910 - in head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common: pid proc

[Mark Johnston]

Author: markj
Date: Fri Jan 30 04:14:19 2015
New Revision: 277910
URL: https://svnweb.freebsd.org/changeset/base/277910

Log:
  Use the correct field when reading the PID out of a struct proc.
  
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d	Fri Jan 30 04:11:30 2015	(r277909)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d	Fri Jan 30 04:14:19 2015	(r277910)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
 proc:::create
 /pid == $1/
 {
-	child = args[0]->pr_pid;
+	child = args[0]->p_pid;
 	trace(pid);
 }
 

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Fri Jan 30 04:11:30 2015	(r277909)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d	Fri Jan 30 04:14:19 2015	(r277910)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
 proc:::create
 /pid == $1/
 {
-	child = args[0]->pr_pid;
+	child = args[0]->p_pid;
 }
 
 pid$1:a.out:go:

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Fri Jan 30 04:11:30 2015	(r277909)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh	Fri Jan 30 04:14:19 2015	(r277910)
@@ -36,7 +36,7 @@ script()
 {
 	$dtrace -s /dev/stdin <<EOF
 	proc:::signal-discard
-	/args[1]->pr_pid == $child &&
+	/args[1]->p_pid == $child &&
 	    args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/
 	{
 		exit(0);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Fri Jan 30 04:11:30 2015	(r277909)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh	Fri Jan 30 04:14:19 2015	(r277910)
@@ -42,7 +42,7 @@ script()
 		/*
 		 * This is guaranteed to not race with signal-handle.
 		 */
-		target = args[1]->pr_pid;
+		target = args[1]->p_pid;
 	}
 
 	proc:::signal-handle