From owner-p4-projects@FreeBSD.ORG  Wed Feb  6 22:03: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 D99AD16A49C; Wed,  6 Feb 2008 22:03:56 +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 5ECA816A41A
	for <perforce@freebsd.org>; Wed,  6 Feb 2008 22:03:56 +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 4540B13C44B
	for <perforce@freebsd.org>; Wed,  6 Feb 2008 22:03:56 +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 m16M3uvK011609
	for <perforce@freebsd.org>; Wed, 6 Feb 2008 22:03:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m16M3uWe011606
	for perforce@freebsd.org; Wed, 6 Feb 2008 22:03:56 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 6 Feb 2008 22:03:56 GMT
Message-Id: <200802062203.m16M3uWe011606@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 134931 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: Wed, 06 Feb 2008 22:03:57 -0000

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

Change 134931 by jb@jb_freebsd1 on 2008/02/06 22:03:40

	Add a kdb_enter() stub to the DTrace kernel hooks stuff for the case
	when the kernel is built without KDB. I don't want DTrace to panic
	when a DTrace breakpoint is used without KDB.
	
	Add the call to kdb_enter() in the DTrace breakpoint action code.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#33 edit
.. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#5 edit

Differences ...

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

@@ -113,6 +113,7 @@
 #if !defined(sun)
 #include <sys/ctype.h>
 #include <sys/limits.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
@@ -5374,9 +5375,10 @@
 	c[i++] = ')';
 	c[i] = '\0';
 
-printf("%s(%d): DOODAD\n",__func__,__LINE__);
-#ifdef DOODAD
+#if defined(sun)
 	debug_enter(c);
+#else
+	kdb_enter(KDB_WHY_DTRACE, "breakpoint action");
 #endif
 }
 

==== //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#5 (text+ko) ====

@@ -27,9 +27,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_kdb.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/eventhandler.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
@@ -103,3 +106,15 @@
 }
 
 SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL)
+
+#ifndef KDB
+/*
+ * This is a stub for the kernel debugger for the DTrace actions to call
+ * when the kernel has been built without KDB.
+ */
+void
+kdb_enter(const char *why, const char *msg)
+{
+	printf("Cannot enter kernel debugger - No KDB in kernel.\n%s - %s\n", why, msg);
+}
+#endif