From owner-p4-projects@FreeBSD.ORG  Fri Dec  9 21:04:16 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 8037B16A422; Fri,  9 Dec 2005 21:04:16 +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 59E7E16A41F
	for <perforce@freebsd.org>; Fri,  9 Dec 2005 21:04:16 +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 EFFA343D58
	for <perforce@freebsd.org>; Fri,  9 Dec 2005 21:04:15 +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 jB9L4FP9042425
	for <perforce@freebsd.org>; Fri, 9 Dec 2005 21:04:15 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB9L4FqP042422
	for perforce@freebsd.org; Fri, 9 Dec 2005 21:04:15 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 9 Dec 2005 21:04:15 GMT
Message-Id: <200512092104.jB9L4FqP042422@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 87977 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: Fri, 09 Dec 2005 21:04:17 -0000

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

Change 87977 by jhb@jhb_slimer on 2005/12/09 21:03:55

	Add a state field and list state of mtx_lock there and only output
	owner field if the lock is held.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_mutex.c#112 edit

Differences ...

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

@@ -990,14 +990,21 @@
 		db_printf(", RECURSE");
 	if (m->mtx_object.lo_flags & LO_DUPOK)
 		db_printf(", DUPOK");
-	db_printf("}\n");
-	db_printf(" owner: ");
+	db_printf(" state: {");
 	if (mtx_unowned(m))
-		db_printf("UNOWNED\n");
+		db_printf("UNOWNED");
 	else {
+		db_printf("OWNED");
+		if (m->mtx_lock & MTX_CONTESTED)
+			db_printf(", CONTESTED");
+		if (m->mtx_lock & MTX_RECURSED)
+			db_printf(", RECURSED");
+	}
+	db_printf("}\n");
+	if (!mtx_unowned(m)) {
 		td = mtx_owner(m);
-		db_printf("%p (tid %d, pid %d, \"%s\")\n", td, td->td_tid,
-		    td->td_proc->p_pid, td->td_proc->p_comm);
+		db_printf(" owner: %p (tid %d, pid %d, \"%s\")\n", td,
+		    td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm);
 		if (mtx_recursed(m))
 			db_printf(" recursed: %d\n", m->mtx_recurse);
 	}