From owner-p4-projects@FreeBSD.ORG  Tue Dec 13 21:56:27 2005
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 06DA216A422; Tue, 13 Dec 2005 21:56:27 +0000 (GMT)
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 D4D8816A41F
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 21:56:26 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 995AB43D5E
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 21:56:26 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDLuQmO088932
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 21:56:26 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDLuQdg088929
	for perforce@freebsd.org; Tue, 13 Dec 2005 21:56:26 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 13 Dec 2005 21:56:26 GMT
Message-Id: <200512132156.jBDLuQdg088929@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88148 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 Dec 2005 21:56:28 -0000

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

Change 88148 by jhb@jhb_slimer on 2005/12/13 21:55:37

	Misc cleanups and one more test case.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_mutex.c#113 edit
.. //depot/projects/smpng/sys/kern/kern_sx.c#29 edit
.. //depot/projects/smpng/sys/modules/crash/crash.c#24 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_mutex.c#113 (text+ko) ====

@@ -990,6 +990,7 @@
 		db_printf(", RECURSE");
 	if (m->mtx_object.lo_flags & LO_DUPOK)
 		db_printf(", DUPOK");
+	db_printf("}\n");
 	db_printf(" state: {");
 	if (mtx_unowned(m))
 		db_printf("UNOWNED");

==== //depot/projects/smpng/sys/kern/kern_sx.c#29 (text+ko) ====

@@ -393,12 +393,12 @@
 	db_printf(" state: ");
 	if (sx->sx_cnt < 0) {
 		td = sx->sx_xholder;
-		db_printf(" XLOCK: %p (tid %d, pid %d, \"%s\")\n", td,
+		db_printf("XLOCK: %p (tid %d, pid %d, \"%s\")\n", td,
 		    td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm);
 	} else if (sx->sx_cnt > 0)
-		db_printf(" SLOCK: %d locks\n", sx->sx_cnt);
+		db_printf("SLOCK: %d locks\n", sx->sx_cnt);
 	else
-		db_printf(" UNLOCKED\n");
+		db_printf("UNLOCKED\n");
 	db_printf(" waiters: %d shared, %d exclusive\n", sx->sx_shrd_wcnt,
 	    sx->sx_excl_wcnt);
 }

==== //depot/projects/smpng/sys/modules/crash/crash.c#24 (text+ko) ====

@@ -89,6 +89,9 @@
 
 	mtx_lock(&test_mtx);
 	kdb_enter("test_mtx locked");
+	mtx_lock(&test_mtx);
+	kdb_enter("test_mtx recursed");
+	mtx_unlock(&test_mtx);
 	mtx_unlock(&test_mtx);
 	sx_slock(&foo);
 	kdb_enter("foo slocked");