From owner-p4-projects@FreeBSD.ORG  Fri Mar 21 23:26:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B86A1065675; Fri, 21 Mar 2008 23:26:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF81E1065673
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:25:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FCA08FC1C
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:25:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2LNPx7V041949
	for <perforce@freebsd.org>; Fri, 21 Mar 2008 23:25:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2LNPwAV041943
	for perforce@freebsd.org; Fri, 21 Mar 2008 23:25:58 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 21 Mar 2008 23:25:58 GMT
Message-Id: <200803212325.m2LNPwAV041943@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 138260 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: Fri, 21 Mar 2008 23:26:00 -0000

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

Change 138260 by jb@jb_freebsd8 on 2008/03/21 23:25:48

	Disable probes when a panic is active like on Solaris.
	
	Include dtrace_isa.c (the Instruction Specific Architecture [?]) specific
	file using the include paths. This ensures that the i386 version is
	included rather than the amd64 one, although they could probably share
	the same file.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#42 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#42 (text) ====

@@ -487,7 +487,6 @@
 									\
 		if (addr + size <= dtrace_toxrange[i].dtt_base)		\
 			continue;					\
-dtrace_debug_printf("%s: 0x%lx <= addr 0x%lx <= 0x%lx\n", __func__,(u_long) dtrace_toxrange[i].dtt_base,(u_long) addr,(u_long) dtrace_toxrange[i].dtt_limit); \
 									\
 		/*							\
 		 * This address falls within a toxic region; return 0.	\
@@ -5788,13 +5787,15 @@
 
 #if defined(sun)
 	if (panic_quiesce) {
+#else
+	if (panicstr != NULL) {
+#endif
 		/*
 		 * We don't trace anything if we're panicking.
 		 */
 		dtrace_interrupt_enable(cookie);
 		return;
 	}
-#endif
 
 	now = dtrace_gethrtime();
 	vtime = dtrace_vtime_references != 0;
@@ -6057,7 +6058,6 @@
 				    size / sizeof (pc_t), probe->dtpr_aframes,
 				    DTRACE_ANCHORED(probe) ? NULL :
 				    (uint32_t *)arg0);
-
 				continue;
 
 			case DTRACEACT_JSTACK:
@@ -16313,9 +16313,7 @@
 #include <dtrace_unload.c>
 #include <dtrace_vtime.c>
 #include <dtrace_hacks.c>
-#if defined(__amd64__) || defined(__i386__)
-#include <amd64/dtrace_isa.c>
-#endif
+#include <dtrace_isa.c>
 
 SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL);
 SYSUNINIT(dtrace_unload, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_unload, NULL);