From owner-p4-projects@FreeBSD.ORG  Mon Aug 14 18:27:39 2006
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 CD4E916A4E1; Mon, 14 Aug 2006 18:27:38 +0000 (UTC)
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 7868D16A517
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 18:27:38 +0000 (UTC)
	(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 437E943D72
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 18:27:38 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EIRceZ016064
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 18:27:38 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EIRc6f016061
	for perforce@freebsd.org; Mon, 14 Aug 2006 18:27:38 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 14 Aug 2006 18:27:38 GMT
Message-Id: <200608141827.k7EIRc6f016061@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 103886 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, 14 Aug 2006 18:27:39 -0000

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

Change 103886 by jhb@jhb_mutex on 2006/08/14 18:26:42

	Use shared locks for the second lockers in the mixed test.

Affected files ...

.. //depot/projects/smpng/sys/modules/crash2/crash2.c#11 edit

Differences ...

==== //depot/projects/smpng/sys/modules/crash2/crash2.c#11 (text+ko) ====

@@ -112,9 +112,9 @@
 		lockmgr(locks[thread % 4], LK_EXCLUSIVE, NULL, curthread);
 	tsleep(sxs, 0, "slp_dead", hz/10);
 	if (thread % 2)
-		lockmgr(locks[(thread + 1) % 4], LK_EXCLUSIVE, NULL, curthread);
+		lockmgr(locks[(thread + 1) % 4], LK_SHARED, NULL, curthread);
 	else
-		sx_xlock(sxs[(thread + 1) % 4]);
+		sx_slock(sxs[(thread + 1) % 4]);
 }
 CRASH2_EVENT("sx and lockmgr cycle", sleep_deadlock, sleep_deadlock,
     sleep_deadlock, sleep_deadlock);