From owner-svn-src-user@FreeBSD.ORG  Tue May 26 18:30:18 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45E851065686;
	Tue, 26 May 2009 18:30:18 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 353A18FC21;
	Tue, 26 May 2009 18:30:18 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QIUIAN068309;
	Tue, 26 May 2009 18:30:18 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QIUIXK068308;
	Tue, 26 May 2009 18:30:18 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905261830.n4QIUIXK068308@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 26 May 2009 18:30:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192826 - user/kmacy/releng_7_2_fcs/sys/dev/hwpmc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2009 18:30:18 -0000

Author: kmacy
Date: Tue May 26 18:30:17 2009
New Revision: 192826
URL: http://svn.freebsd.org/changeset/base/192826

Log:
  fix inconsistent locking state
  
  (partly) pointed out by: attilio@

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_logging.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_logging.c	Tue May 26 17:57:37 2009	(r192825)
+++ user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_logging.c	Tue May 26 18:30:17 2009	(r192826)
@@ -269,10 +269,8 @@ pmclog_loop(void *arg)
 	mtx_lock_spin(&po->po_mtx);
 	for (;;) {
 		/* check if we've been asked to exit */
-		if ((po->po_flags & PMC_PO_OWNS_LOGFILE) == 0) {
-			mtx_unlock_spin(&po->po_mtx);
+		if ((po->po_flags & PMC_PO_OWNS_LOGFILE) == 0)
 			break;
-		}
 		
 		if (lb == NULL) { /* look for a fresh buffer to write */
 			if ((lb = TAILQ_FIRST(&po->po_logbuffers)) == NULL) {
@@ -324,7 +322,7 @@ pmclog_loop(void *arg)
 			po->po_error = error; /* save for flush log */
 
 			PMCDBG(LOG,WRI,2, "po=%p error=%d", po, error);
-
+			mtx_lock_spin(&po->po_mtx);
 			break;
 		}
 
@@ -337,7 +335,6 @@ pmclog_loop(void *arg)
 		lb = NULL;
 		mtx_lock_spin(&po->po_mtx);
 	}
-	mtx_lock_spin(&po->po_mtx);
 	po->po_kthread = NULL;
 	cv_signal(&po->po_kthread_cv);
 	mtx_unlock_spin(&po->po_mtx);
@@ -585,7 +582,7 @@ pmclog_configure_log(struct pmc_mdep *md
 	mtx_lock_spin(&po->po_mtx);
 	if (po->po_kthread)
 		pmclog_stop_kthread(po);
-	mtx_lock_spin(&po->po_mtx);
+	mtx_unlock_spin(&po->po_mtx);
 
 	KASSERT(po->po_kthread == NULL, ("[pmc,%d] po=%p kthread not stopped",
 	    __LINE__, po));