From owner-p4-projects@FreeBSD.ORG  Tue Dec 30 13:46:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1061916A4D0; Tue, 30 Dec 2003 13:46:38 -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 DEAC316A4CE
	for <perforce@freebsd.org>; Tue, 30 Dec 2003 13:46:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD85343D39
	for <perforce@freebsd.org>; Tue, 30 Dec 2003 13:46:36 -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 hBULka0B062162
	for <perforce@freebsd.org>; Tue, 30 Dec 2003 13:46:36 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBULkaSJ062159
	for perforce@freebsd.org; Tue, 30 Dec 2003 13:46:36 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Tue, 30 Dec 2003 13:46:36 -0800 (PST)
Message-Id: <200312302146.hBULkaSJ062159@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 44569 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: Tue, 30 Dec 2003 21:46:38 -0000

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

Change 44569 by jhb@jhb_laptop on 2003/12/30 13:46:24

	Add another test case for try lock and recursive mutexes.

Affected files ...

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

Differences ...

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

@@ -51,7 +51,7 @@
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
-#define	MAX_EVENT	17
+#define	MAX_EVENT	18
 
 static struct sx foo, bar, bar2;
 static struct cv event_cv;
@@ -76,7 +76,8 @@
 	"assert that Giant is locked while it is unlocked",
 	"assert that foo is slocked while it is xlocked",
 	"lock test, slock foo, sunlock foo, unlock test",
-	"use test1 and test2 mutexes to test witness removal"
+	"use test1 and test2 mutexes to test witness removal",
+	"try lock tests including recursion test"
 };
 
 static int	mod_event(struct module *module, int cmd, void *arg);
@@ -111,7 +112,7 @@
 static void
 crash_thread(void *arg)
 {
-	int ev;
+	int ev, status;
 
 	while (1) {
 		mtx_lock(&event_mtx);
@@ -231,6 +232,35 @@
 			mtx_destroy(&test2_mtx);
 			Debugger("test1 and test2 should be gone");
 			break;
+		case 18:
+			bzero(&test1_mtx, sizeof(test1_mtx));
+			bzero(&test1_mtx, sizeof(test2_mtx));
+			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);
+			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);
+			mtx_unlock(&test1_mtx);
+			status = mtx_trylock(&test2_mtx);
+			printf("Try lock of unlocked test2: %d\n", status);
+			if (status)
+				mtx_unlock(&test2_mtx);
+			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);
+			mtx_unlock(&test2_mtx);
+			break;
 		default:
 			panic("event %d is bogus\n", event);
 		}