From owner-svn-src-all@FreeBSD.ORG Fri Jan 30 04:14:21 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09B523D7; Fri, 30 Jan 2015 04:14:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0719ACF; Fri, 30 Jan 2015 04:14:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0U4EK12050910; Fri, 30 Jan 2015 04:14:20 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0U4EJb3050904; Fri, 30 Jan 2015 04:14:19 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201501300414.t0U4EJb3050904@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 30 Jan 2015 04:14:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277910 - in head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common: pid proc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jan 2015 04:14:21 -0000 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 <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