From owner-p4-projects@FreeBSD.ORG  Thu Sep 13 01:34:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 286F516A468; Thu, 13 Sep 2007 01:34:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C189416A420
	for <perforce@freebsd.org>; Thu, 13 Sep 2007 01:34:00 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CE0F13C469
	for <perforce@freebsd.org>; Thu, 13 Sep 2007 01:34:00 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8D1Y0S3014662
	for <perforce@freebsd.org>; Thu, 13 Sep 2007 01:34:00 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8D1Y0UV014654
	for perforce@freebsd.org; Thu, 13 Sep 2007 01:34:00 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 13 Sep 2007 01:34:00 GMT
Message-Id: <200709130134.l8D1Y0UV014654@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126350 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: Thu, 13 Sep 2007 01:34:01 -0000

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

Change 126350 by kmacy@kmacy_home:ethng on 2007/09/13 01:32:58

	update rnh locking primitives to account for the fact 
	that the lock can be recursed

Affected files ...

.. //depot/projects/ethng/src/sys/net/radix.h#4 edit

Differences ...

==== //depot/projects/ethng/src/sys/net/radix.h#4 (text+ko) ====

@@ -145,13 +145,26 @@
 #define Free(p) free((caddr_t)p, M_RTABLE);
 
 #define	RADIX_NODE_HEAD_LOCK_INIT(rnh)	\
-rw_init(&(rnh)->rnh_lock, "radix node head")
+	rw_init_flags(&(rnh)->rnh_lock, "radix node head", RW_RECURSE)
 #define	RADIX_NODE_HEAD_LOCK(rnh)	rw_wlock(&(rnh)->rnh_lock)
 #define	RADIX_NODE_HEAD_UNLOCK(rnh)	rw_wunlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_LOCK_SHARED(rnh)	rw_rlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_UNLOCK_SHARED(rnh)	rw_runlock(&(rnh)->rnh_lock)
+#define	RADIX_NODE_HEAD_LOCK_DOWNGRADE(rnh)	rw_downgrade(&(rnh)->rnh_lock)
+#define	RADIX_NODE_HEAD_LOCK_TRY_UPGRADE(rnh)	rw_try_upgrade(&(rnh)->rnh_lock)
+#define	RADIX_NODE_HEAD_LOCK_SHARED(rnh)			      \
+	do {							      \
+		if (!rw_wowned(&(rnh)->rnh_lock))		      \
+			rw_rlock(&(rnh)->rnh_lock);		      \
+	} while (0)
+
+#define	RADIX_NODE_HEAD_UNLOCK_SHARED(rnh)			      \
+	do {							      \
+		if (!rw_wowned(&(rnh)->rnh_lock))		      \
+			rw_runlock(&(rnh)->rnh_lock);		      \
+	} while (0)
+
 #define	RADIX_NODE_HEAD_DESTROY(rnh)	rw_destroy(&(rnh)->rnh_lock)
 #define	RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED)
+#define	RADIX_NODE_HEAD_UNLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_UNLOCKED)
 #endif /* _KERNEL */
 
 void	 rn_init(void);