From owner-svn-src-user@FreeBSD.ORG  Tue May 26 04:33:17 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 38CDC106566C;
	Tue, 26 May 2009 04:33:17 +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 270188FC1D;
	Tue, 26 May 2009 04:33:17 +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 n4Q4XHfR046251;
	Tue, 26 May 2009 04:33:17 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4Q4XG17046248;
	Tue, 26 May 2009 04:33:16 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905260433.n4Q4XG17046248@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 26 May 2009 04:33:16 +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: r192785 - in user/kmacy/releng_7_2_fcs/sys: amd64/conf
	conf kern
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 04:33:17 -0000

Author: kmacy
Date: Tue May 26 04:33:16 2009
New Revision: 192785
URL: http://svn.freebsd.org/changeset/base/192785

Log:
  add the option of having condvars ignoring extra locks held
  this makes WITNESS much quietery (i.e. more useful) with ZFS

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS
  user/kmacy/releng_7_2_fcs/sys/conf/options
  user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS	Tue May 26 03:56:56 2009	(r192784)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/conf/GENERIC_MINUS	Tue May 26 04:33:16 2009	(r192785)
@@ -73,6 +73,7 @@ options		INVARIANT_SUPPORT
 
 options		WITNESS
 options		WITNESS_SKIPSPIN
+options		WITNESS_SKIPCV
 options		DEBUG
 options		KDB
 options		DDB

Modified: user/kmacy/releng_7_2_fcs/sys/conf/options
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/options	Tue May 26 03:56:56 2009	(r192784)
+++ user/kmacy/releng_7_2_fcs/sys/conf/options	Tue May 26 04:33:16 2009	(r192785)
@@ -642,6 +642,7 @@ KTR_VERBOSE		opt_ktr.h
 WITNESS			opt_global.h
 WITNESS_KDB		opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
+WITNESS_SKIPCV		opt_witness.h
 
 # options for ACPI support
 ACPI_DEBUG		opt_acpi.h

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Tue May 26 03:56:56 2009	(r192784)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Tue May 26 04:33:16 2009	(r192785)
@@ -106,8 +106,10 @@ _cv_wait(struct cv *cvp, struct lock_obj
 		ktrcsw(1, 0);
 #endif
 	CV_ASSERT(cvp, lock, td);
+#ifndef WITNESS_SKIPCV
 	WITNESS_WARN(WARN_GIANTOK, lock,
 	    "Waiting on \"%s\"", cvp->cv_description);
+#endif
 	WITNESS_SAVE(lock, lock_witness);
 	class = LOCK_CLASS(lock);