From owner-p4-projects@FreeBSD.ORG  Fri Jan 27 23:02:48 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 2B1AC16A423; Fri, 27 Jan 2006 23:02:48 +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 049FA16A420
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 23:02:48 +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 BD2FC43D46
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 23:02:47 +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 k0RN2lCv064016
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 23:02:47 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RN2lBc064013
	for perforce@freebsd.org; Fri, 27 Jan 2006 23:02:47 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 27 Jan 2006 23:02:47 GMT
Message-Id: <200601272302.k0RN2lBc064013@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 90521 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, 27 Jan 2006 23:02:49 -0000

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

Change 90521 by jhb@jhb_slimer on 2006/01/27 23:02:37

	Integ changes from jhb_lock branch.

Affected files ...

.. //depot/projects/smpng/sys/modules/crash/crash.c#28 integrate

Differences ...

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

@@ -49,11 +49,12 @@
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/refcount.h>
+#include <sys/rwlock.h>
 #include <sys/sched.h>
-#include <sys/unistd.h>
-#include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
 
 struct crash_event {
 	const char *ev_name;
@@ -69,6 +70,7 @@
 
 #define	MAX_EVENT	SET_COUNT(crash_event_set)
 
+static struct rwlock baz;
 static struct sx foo, bar, bar2;
 static struct cv event_cv;
 static struct mtx event_mtx, test_mtx, test1_mtx, test2_mtx;
@@ -83,6 +85,49 @@
 
 /* Events. */
 
+#ifdef WITNESS
+static void
+fault_with_lock(void)
+{
+	char c, *cp;
+
+	cp = NULL;
+	mtx_lock(&test_mtx);
+	c = *cp;
+	mtx_unlock(&test_mtx);
+	printf("Read value of %x\n", (int)c);
+}
+CRASH_EVENT("fault with a mutex held", fault_with_lock);
+#endif
+
+static void
+rwlock_wlock(void)
+{
+
+	rw_init(&baz, "baz");
+	kdb_enter("baz exists");
+	rw_wlock(&baz);
+	kdb_enter("baz has a writer");
+	rw_wunlock(&baz);
+	kdb_enter("baz is unlocked");
+	rw_destroy(&baz);
+}
+CRASH_EVENT("rw_wlock", rwlock_wlock);
+
+static void
+rwlock_rlock(void)
+{
+
+	rw_init(&baz, "baz");
+	kdb_enter("baz exists");
+	rw_rlock(&baz);
+	kdb_enter("baz has a reader");
+	rw_runlock(&baz);
+	kdb_enter("baz is unlocked");
+	rw_destroy(&baz);
+}
+CRASH_EVENT("rw_rlock", rwlock_rlock);
+
 static void
 msleep_spin_callout(void *dummy)
 {