From owner-p4-projects@FreeBSD.ORG  Tue Jun 13 01:18:43 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 C8A8316A474; Tue, 13 Jun 2006 01:18:43 +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 8D00416A418
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 01:18:43 +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 5983F43D48
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 01:18:43 +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 k5D1GQ7j055368
	for <perforce@freebsd.org>; Tue, 13 Jun 2006 01:16:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1GQrc055365
	for perforce@freebsd.org; Tue, 13 Jun 2006 01:16:26 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 13 Jun 2006 01:16:26 GMT
Message-Id: <200606130116.k5D1GQrc055365@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 99108 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:18:44 -0000

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

Change 99108 by jb@jb_freebsd2 on 2006/06/13 01:16:03

	Add a bit of debug code while I'm still searching for things that
	cause double faults in fbt.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#14 edit

Differences ...

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

@@ -34,6 +34,18 @@
 
 	SDT_PROBE(dtrace, ioctl, entry, cmd, addr, 0, 0, 0);
 
+#if defined(__i386__)
+	/*
+	 * Check if any probe recursions have occurred. These are more
+	 * likely to cause a crash, but let's try to report them if we
+	 * can.
+	 */
+	if (dtrace_in_probe_addr != 0) {
+		printf("dtrace_in_probe_addr 0x%lx\n", (u_long) dtrace_in_probe_addr);
+		dtrace_in_probe_addr = 0;
+	}
+#endif
+
 	switch (cmd) {
 	case DTRACEIOC_AGGDESC: {
 		dtrace_aggdesc_t **paggdesc = (dtrace_aggdesc_t **) addr;