From owner-p4-projects@FreeBSD.ORG  Wed Jun  7 00:27:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9294316CF96; Wed,  7 Jun 2006 00:08:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A5E1A16BDD7
	for <perforce@freebsd.org>; Tue,  6 Jun 2006 23:36:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6922143D48
	for <perforce@freebsd.org>; Tue,  6 Jun 2006 23:36:41 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k56NYp3A043151
	for <perforce@freebsd.org>; Tue, 6 Jun 2006 23:34:51 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k56NYp5w043148
	for perforce@freebsd.org; Tue, 6 Jun 2006 23:34:51 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 6 Jun 2006 23:34:51 GMT
Message-Id: <200606062334.k56NYp5w043148@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 98710 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 00:27:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=98710

Change 98710 by jb@jb_freebsd2 on 2006/06/06 23:34:09

	Enable the chill action.

Affected files ...

.. //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#17 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/test/dtrace/Makefile#17 (text+ko) ====

@@ -388,6 +388,7 @@
 	${.CURDIR}/tst/common/funcs/tst.badfreopen.ksh \
 	${.CURDIR}/tst/common/funcs/tst.basename.d \
 	${.CURDIR}/tst/common/funcs/tst.bcopy.d \
+	${.CURDIR}/tst/common/funcs/tst.chill.ksh \
 	${.CURDIR}/tst/common/funcs/tst.cleanpath.d \
 	${.CURDIR}/tst/common/funcs/tst.default.d \
 	${.CURDIR}/tst/common/funcs/tst.ftruncate.ksh \
@@ -1375,7 +1376,6 @@
 	${.CURDIR}/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh \
 	${.CURDIR}/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \
 	${.CURDIR}/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh \
-	${.CURDIR}/tst/common/funcs/tst.chill.ksh \
 	${.CURDIR}/tst/common/inline/tst.InlineKinds.d \
 	${.CURDIR}/tst/common/printa/tst.stack.d \
 

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#4 (text+ko) ====

@@ -137,11 +137,13 @@
 static void
 dtrace_action_chill(dtrace_mstate_t *mstate, hrtime_t val)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
 	hrtime_t now;
 	volatile uint16_t *flags;
+#if defined(sun)
 	cpu_t *cpu = CPU;
+#else
+	cpu_t *cpu = pcpu_find(curcpu);
+#endif
 
 	if (dtrace_destructive_disallow)
 		return;
@@ -179,7 +181,6 @@
 	 */
 	mstate->dtms_present &= ~DTRACE_MSTATE_TIMESTAMP;
 	cpu->cpu_dtrace_chilled += val;
-#endif
 }
 
 static void