From owner-p4-projects@FreeBSD.ORG  Sun May 14 00:52:12 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 92B9116A41A; Sun, 14 May 2006 00:52:12 +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 569BB16A414
	for <perforce@freebsd.org>; Sun, 14 May 2006 00:52:12 +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 A194743D6A
	for <perforce@freebsd.org>; Sun, 14 May 2006 00:52:05 +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 k4E0q0uR079154
	for <perforce@freebsd.org>; Sun, 14 May 2006 00:52:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4E0q0YD079151
	for perforce@freebsd.org; Sun, 14 May 2006 00:52:00 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 14 May 2006 00:52:00 GMT
Message-Id: <200605140052.k4E0q0YD079151@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 97118 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: Sun, 14 May 2006 00:52:12 -0000

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

Change 97118 by jb@jb_freebsd2 on 2006/05/14 00:51:10

	Use the curthread in places to make the code look more like Sun's.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#8 edit

Differences ...

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

@@ -71,8 +71,10 @@
 	}
 
 	case DIF_VAR_CURTHREAD:
+#if defined(sun)
 		if (!dtrace_priv_kernel(state))
 			return (0);
+#endif
 		return ((uint64_t)(uintptr_t)curthread);
 
 	case DIF_VAR_TIMESTAMP:
@@ -94,8 +96,10 @@
 		return (mstate->dtms_walltimestamp);
 
 	case DIF_VAR_IPL:
+#if defined(sun)
 		if (!dtrace_priv_kernel(state))
 			return (0);
+#endif
 		if (!(mstate->dtms_present & DTRACE_MSTATE_IPL)) {
 			mstate->dtms_ipl = dtrace_getipl();
 			mstate->dtms_present |= DTRACE_MSTATE_IPL;
@@ -111,8 +115,10 @@
 		return (mstate->dtms_probe->dtpr_id);
 
 	case DIF_VAR_STACKDEPTH:
+#if defined(sun)
 		if (!dtrace_priv_kernel(state))
 			return (0);
+#endif
 		if (!(mstate->dtms_present & DTRACE_MSTATE_STACKDEPTH)) {
 			int aframes = mstate->dtms_probe->dtpr_aframes + 2;
 
@@ -122,10 +128,10 @@
 		return (mstate->dtms_stackdepth);
 
 	case DIF_VAR_USTACKDEPTH:
-printf("%s:%s(%d): DIF_VAR_USTACKDEPTH\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
+#if defined(sun)
 		if (!dtrace_priv_proc(state))
 			return (0);
+#endif
 		if (!(mstate->dtms_present & DTRACE_MSTATE_USTACKDEPTH)) {
 			/*
 			 * See comment in DIF_VAR_PID.
@@ -142,13 +148,12 @@
 			mstate->dtms_present |= DTRACE_MSTATE_USTACKDEPTH;
 		}
 		return (mstate->dtms_ustackdepth);
-#else
-return 0;
-#endif
 
 	case DIF_VAR_CALLER:
+#if defined(sun)
 		if (!dtrace_priv_kernel(state))
 			return (0);
+#endif
 		if (!(mstate->dtms_present & DTRACE_MSTATE_CALLER)) {
 			int aframes = mstate->dtms_probe->dtpr_aframes + 2;
 
@@ -246,17 +251,17 @@
 		 */
 		return ((uint64_t)curthread->t_procp->p_pidp->pid_id);
 #else
-		return ((uint64_t)curproc->p_pid);
+		return ((uint64_t)curthread->td_proc->p_pid);
 #endif
 
 	case DIF_VAR_TID:
-#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
 		if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU))
 			return (0);
 
+#if defined(sun)
 		return ((uint64_t)curthread->t_tid);
 #else
 		return ((uint64_t)curthread->td_tid);
@@ -282,7 +287,7 @@
 		return ((uint64_t)(uintptr_t)
 		    curthread->t_procp->p_user.u_comm);
 #else
-		return ((uint64_t)(uintptr_t) curproc->p_comm);
+		return ((uint64_t)(uintptr_t) curthread->td_proc->p_comm);
 #endif
 
 	case DIF_VAR_ZONENAME:
@@ -580,7 +585,7 @@
 			}
 		}
 #else
-		for (p = curproc; p != NULL; p = p->p_pptr) {
+		for (p = curthread->td_proc; p != NULL; p = p->p_pptr) {
 			if (p->p_pid == pid) {
 				rval = 1;
 				break;