From owner-p4-projects@FreeBSD.ORG  Tue Jul  4 19:57:36 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 8DE5C16A4E1; Tue,  4 Jul 2006 19:57:36 +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 6713516A4DA
	for <perforce@FreeBSD.org>; Tue,  4 Jul 2006 19:57:36 +0000 (UTC)
	(envelope-from ryanb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2D49443D45
	for <perforce@FreeBSD.org>; Tue,  4 Jul 2006 19:57:36 +0000 (GMT)
	(envelope-from ryanb@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 k64Jva8p086019
	for <perforce@FreeBSD.org>; Tue, 4 Jul 2006 19:57:36 GMT
	(envelope-from ryanb@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k64JvZAW086016
	for perforce@freebsd.org; Tue, 4 Jul 2006 19:57:35 GMT
	(envelope-from ryanb@FreeBSD.org)
Date: Tue, 4 Jul 2006 19:57:35 GMT
Message-Id: <200607041957.k64JvZAW086016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ryanb@FreeBSD.org using -f
From: Ryan Beasley <ryanb@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100571 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: Tue, 04 Jul 2006 19:57:36 -0000

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

Change 100571 by ryanb@ryanb_yuki on 2006/07/04 19:57:31

	Add a few mtx_assert()s for extra sanity checking goodness.

Affected files ...

.. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#10 edit
.. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#8 edit

Differences ...

==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#10 (text+ko) ====

@@ -1356,11 +1356,14 @@
 		if (d == NULL)
 			continue;
 
+		/* See the note in function docblock */
+		mtx_assert(d->lock, MA_NOTOWNED);
 		pcm_inprog(d, 1);
 		pcm_lock(d);
 
 		SLIST_FOREACH(sce, &d->channels, link) {
 			ch = sce->channel;
+			mtx_assert(ch->lock, MA_NOTOWNED);
 			CHN_LOCK(ch);
 			if (ai->dev == -1) {
 				if ((ch == i_dev->si_drv1) ||

==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#8 (text+ko) ====

@@ -1171,6 +1171,8 @@
 			if (!d)
 				continue;
 
+			/* See note in function's docblock */
+			mtx_assert(d->lock, MA_NOTOWNED);
 			/* Increment device's "operations in progress" */
 			pcm_inprog(d, 1);
 			pcm_lock(d);
@@ -1180,6 +1182,7 @@
 
 			SLIST_FOREACH(sce, &d->channels, link) {
 				c = sce->channel;
+				mtx_assert(c->lock, MA_NOTOWNED);
 				CHN_LOCK(c);
 				if (c->flags & CHN_F_BUSY)
 					si->openedaudio[j / intnbits] |=