From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 07:49:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A540616A468; Mon,  7 Jan 2008 07:49:57 +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 6A6F716A41A
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:49:57 +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 63E6813C46A
	for <perforce@freebsd.org>; Mon,  7 Jan 2008 07:49:57 +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 m077nvW1031820
	for <perforce@freebsd.org>; Mon, 7 Jan 2008 07:49:57 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077nv04031817
	for perforce@freebsd.org; Mon, 7 Jan 2008 07:49:57 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 7 Jan 2008 07:49:57 GMT
Message-Id: <200801070749.m077nv04031817@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 132688 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: Mon, 07 Jan 2008 07:49:58 -0000

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

Change 132688 by jb@jb_freebsd1 on 2008/01/07 07:49:49

	Include the debug code.
	
	Cleanup the include paths.
	
	Add the debug output function to the deadman cyclic callback function
	which is usually called each second.

Affected files ...

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

Differences ...

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

@@ -111,6 +111,7 @@
 
 /* FreeBSD includes: */
 #if !defined(sun)
+#include <sys/ctype.h>
 #include <sys/limits.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -118,6 +119,7 @@
 #include <sys/vmem.h>
 #include <sys/dtrace_bsd.h>
 #include "dtrace_cddl.h"
+#include "dtrace_debug.c"
 #endif
 
 /*
@@ -2644,6 +2646,7 @@
 		}
 		return (mstate->dtms_walltimestamp);
 
+#if defined(sun)
 	case DIF_VAR_IPL:
 		if (!dtrace_priv_kernel(state))
 			return (0);
@@ -2652,6 +2655,7 @@
 			mstate->dtms_present |= DTRACE_MSTATE_IPL;
 		}
 		return (mstate->dtms_ipl);
+#endif
 
 	case DIF_VAR_EPID:
 		ASSERT(mstate->dtms_present & DTRACE_MSTATE_EPID);
@@ -12305,6 +12309,10 @@
 
 	dtrace_sync();
 
+#if !defined(sun)
+	dtrace_debug_output();
+#endif
+
 	now = dtrace_gethrtime();
 
 	if (state != dtrace_anon.dta_state &&
@@ -15976,17 +15984,17 @@
 	.d_name		= "dtrace",
 };
 
-#include <cddl/dev/dtrace/dtrace_anon.c>
-#include <cddl/dev/dtrace/dtrace_clone.c>
-#include <cddl/dev/dtrace/dtrace_ioctl.c>
-#include <cddl/dev/dtrace/dtrace_load.c>
-#include <cddl/dev/dtrace/dtrace_modevent.c>
-#include <cddl/dev/dtrace/dtrace_sysctl.c>
-#include <cddl/dev/dtrace/dtrace_unload.c>
-#include <cddl/dev/dtrace/dtrace_vtime.c>
-#include <cddl/dev/dtrace/dtrace_hacks.c>
+#include <dtrace_anon.c>
+#include <dtrace_clone.c>
+#include <dtrace_ioctl.c>
+#include <dtrace_load.c>
+#include <dtrace_modevent.c>
+#include <dtrace_sysctl.c>
+#include <dtrace_unload.c>
+#include <dtrace_vtime.c>
+#include <dtrace_hacks.c>
 #if defined(__amd64__)
-#include <cddl/dev/dtrace/amd64/dtrace_isa.c>
+#include <amd64/dtrace_isa.c>
 #endif
 
 SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL);