From owner-p4-projects@FreeBSD.ORG  Wed Dec 31 11:43:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCDC216A4D0; Wed, 31 Dec 2003 11:43:47 -0800 (PST)
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 A3A9716A4CE
	for <perforce@freebsd.org>; Wed, 31 Dec 2003 11:43:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A980043D45
	for <perforce@freebsd.org>; Wed, 31 Dec 2003 11:43:46 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBVJhk0B078573
	for <perforce@freebsd.org>; Wed, 31 Dec 2003 11:43:46 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBVJhkrV078570
	for perforce@freebsd.org; Wed, 31 Dec 2003 11:43:46 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Wed, 31 Dec 2003 11:43:46 -0800 (PST)
Message-Id: <200312311943.hBVJhkrV078570@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>
Subject: PERFORCE change 44608 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 31 Dec 2003 19:43:48 -0000

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

Change 44608 by jhb@jhb_blue on 2003/12/31 11:43:15

	Use a macro to simplify the trylock stuff and make it print out the
	recursion count each time as well.

Affected files ...

.. //depot/projects/smpng/sys/modules/crash/crash.c#7 edit

Differences ...

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

@@ -238,28 +238,22 @@
 			mtx_init(&test1_mtx, "test1", NULL, MTX_DEF);
 			mtx_init(&test1_mtx, "test2", NULL, MTX_DEF |
 			    MTX_RECURSE);
-			status = mtx_trylock(&test1_mtx);
-			printf("Try lock of unlocked test1: %d\n", status);
-			if (status)
-				mtx_unlock(&test1_mtx);
+#define TRYLOCK_TEST(lock, descr) do {					\
+	status = mtx_trylock((lock));					\
+	printf("Try lock of " descr ": %d;  recurse = %d\n",		\
+	    status, (lock)->mtx_recurse);				\
+	if (status)							\
+		mtx_unlock((lock));					\
+} while(0)
+			TRYLOCK_TEST(&test1_mtx, "unlocked test1");
 			mtx_lock(&test1_mtx);
-			status = mtx_trylock(&test1_mtx);
-			printf("Try lock of non-recursive locked test1: %d\n",
-			    status);
-			if (status)
-				mtx_unlock(&test1_mtx);
+			TRYLOCK_TEST(&test1_mtx, "non-recursive locked test1");
 			mtx_unlock(&test1_mtx);
-			status = mtx_trylock(&test2_mtx);
-			printf("Try lock of unlocked test2: %d\n", status);
-			if (status)
-				mtx_unlock(&test2_mtx);
+			TRYLOCK_TEST(&test2_mtx, "unlocked test2");
 			mtx_lock(&test2_mtx);
-			status = mtx_trylock(&test2_mtx);
-			printf("Try lock of recursive locked test2: %d\n",
-			    status);
-			if (status)
-				mtx_unlock(&test2_mtx);
+			TRYLOCK_TEST(&test2_mtx, "recursive locked test2");
 			mtx_unlock(&test2_mtx);
+#undef TRYLOCK_TEST
 			break;
 		default:
 			panic("event %d is bogus\n", event);