From owner-p4-projects@FreeBSD.ORG  Mon Jun  9 03:24:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9203C1065673; Mon,  9 Jun 2008 03:24:47 +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 546B6106566B
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 03:24:47 +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 40ABD8FC14
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 03:24:47 +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 m593OlRx052632
	for <perforce@freebsd.org>; Mon, 9 Jun 2008 03:24:47 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m593Olxd052630
	for perforce@freebsd.org; Mon, 9 Jun 2008 03:24:47 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 9 Jun 2008 03:24:47 GMT
Message-Id: <200806090324.m593Olxd052630@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 143169 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, 09 Jun 2008 03:24:47 -0000

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

Change 143169 by jb@freebsd3 on 2008/06/09 03:23:53

	No destroy_dev_sched() on releng6. More work required on this.
	
	Comment out the lock related stuff because that is still work in progress
	in current.

Affected files ...

.. //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 edit

Differences ...

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

@@ -121,6 +121,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
+#include <sys/signalvar.h>
 #include <sys/dtrace_bsd.h>
 #include <netinet/in.h>
 #include "dtrace_cddl.h"
@@ -3163,6 +3164,7 @@
 		uintptr_t rw;
 	} r;
 #else
+#ifdef DOODAD
 	union {
 		struct mtx *mi;
 		uintptr_t mx;
@@ -3172,6 +3174,7 @@
 		uintptr_t sx;
 	} s;
 #endif
+#endif
 
 	switch (subr) {
 	case DIF_SUBR_RAND:
@@ -3274,17 +3277,16 @@
 	 * 	 Ideally, it would be nice if all these shared a common lock 
 	 * 	 object.
          */
+#ifdef DOODAD
 	case DIF_SUBR_MUTEX_OWNED:
 		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
 		m.mx = tupregs[0].dttk_value;
 
-#ifdef DOODAD
 		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
 			regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED);
 		} else {	
 			regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED);
 		}
-#endif
 		break;
 
 	case DIF_SUBR_MUTEX_OWNER:
@@ -3337,6 +3339,7 @@
 		regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) ||
 		            !(s.si->sx_lock & SX_LOCK_SHARED));
 		break;
+#endif
 #endif /* ! defined(sun) */
 
 	case DIF_SUBR_BCOPY: {
@@ -5594,7 +5597,7 @@
 #if defined(sun)
 	debug_enter(c);
 #else
-	kdb_enter(KDB_WHY_DTRACE, "breakpoint action");
+	kdb_enter("DTrace breakpoint action");
 #endif
 }
 
@@ -15399,8 +15402,10 @@
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&cpu_lock);
 
+#ifdef DOODAD
 	/* Schedule this cloned device to be destroyed. */
 	destroy_dev_sched(dev);
+#endif
 
 	return (0);
 }