mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

only reacquire the lock in no_references() if we actually gave it up

Browse Source
This commit is contained in:
Bob Halley
2001-04-24 17:03:54 +00:00
parent 3ee7b0d2cd
commit 38d21a360a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dns/rbtdb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rbtdb.c,v 1.159 2001/04/20 21:22:09 tale Exp $ */ /* $Id: rbtdb.c,v 1.160 2001/04/24 17:03:54 halley Exp $ */
/* /*
* Principal Author: Bob Halley * Principal Author: Bob Halley
@@ -743,6 +743,7 @@ no_references(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
{ {
isc_result_t result; isc_result_t result;
isc_boolean_t write_locked; isc_boolean_t write_locked;
isc_boolean_t reacquire;
unsigned int locknum; unsigned int locknum;
/* /*
@@ -782,12 +783,14 @@ no_references(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
/* /*
* XXXDCL need to add a deferred delete method for ISC_R_LOCKBUSY. * XXXDCL need to add a deferred delete method for ISC_R_LOCKBUSY.
*/ */
reacquire = ISC_FALSE;
if (lock != isc_rwlocktype_write) { if (lock != isc_rwlocktype_write) {
/* /*
* Free the node lock before acquiring a tree write lock, per * Free the node lock before acquiring a tree write lock, per
* the lock hierarchy rules stated at the start of this file. * the lock hierarchy rules stated at the start of this file.
*/ */
UNLOCK(&rbtdb->node_locks[locknum].lock); UNLOCK(&rbtdb->node_locks[locknum].lock);
reacquire = ISC_TRUE;
if (lock == isc_rwlocktype_read) if (lock == isc_rwlocktype_read)
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
@@ -833,10 +836,10 @@ no_references(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
/* /*
* Reacquire the node lock that the caller held. * Reacquire the node lock that the caller held if necessary.
*/ */
LOCK(&rbtdb->node_locks[locknum].lock); if (reacquire)
LOCK(&rbtdb->node_locks[locknum].lock);
} }
static inline void static inline void