From owner-p4-projects@FreeBSD.ORG  Tue Jun 13 01:00:21 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 8807A16A41F; Tue, 13 Jun 2006 01:00:16 +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 66DDF16A477
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 01:00:16 +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 0D26E43D45
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 01:00:16 +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 k5D0vx2x053199
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 00:57:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0vxYr053196
	for perforce@freebsd.org; Tue, 13 Jun 2006 00:57:59 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 13 Jun 2006 00:57:59 GMT
Message-Id: <200606130057.k5D0vxYr053196@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 99103 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: Tue, 13 Jun 2006 01:00:21 -0000

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

Change 99103 by jb@jb_freebsd2 on 2006/06/13 00:57:48

	Can't do any more printfs from the probe context now that fbt is
	around because it creates double faults which end in tears.
	
	Increment/decrement a count to help debug illegal probe recursion.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#9 edit

Differences ...

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

@@ -50,6 +50,9 @@
 	}
 #endif
 
+	/* Keep track of when a probe is being executed. */
+	dtrace_in_probe++;
+
 	now = dtrace_gethrtime();
 	vtime = dtrace_vtime_references != 0;
 
@@ -435,7 +438,6 @@
 			case DTRACEACT_USYM:
 			case DTRACEACT_UMOD:
 			case DTRACEACT_UADDR: {
-printf("%s(%d): USYM, UMOD or UADDR\n",__FUNCTION__,__LINE__);
 #ifdef DOODAD
 				struct pid *pid = curthread->t_procp->p_pidp;
 
@@ -608,5 +610,11 @@
 	if (vtime)
 		curthread->t_dtrace_start = dtrace_gethrtime();
 
+	/*
+	 * Probes shouldn't be called recursively, so this should return
+	 * to zero.
+	 */
+	dtrace_in_probe--;
+
 	dtrace_interrupt_enable(cookie);
 }