mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

1492. [cleanup] Preserve rwlock quota context when upgrading /

Browse Source 
downgrading. [RT #5599]
This commit is contained in:
Mark Andrews
2003-07-21 01:14:18 +00:00
parent afbb7b15ae
commit 17a14e451d
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
1492. [cleanup] Preserve rwlock quota context when upgrading /
downgrading. [RT #5599]
1491. [bug] dns_master_dump*() would produce extraneous $ORIGIN 1491. [bug] dns_master_dump*() would produce extraneous $ORIGIN
lines. [RT #6206] lines. [RT #6206]

3
lib/isc/include/isc/rwlock.h
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rwlock.h,v 1.19 2003/04/17 01:56:35 marka Exp $ */ /* $Id: rwlock.h,v 1.20 2003/07/21 01:14:18 marka Exp $ */
#ifndef ISC_RWLOCK_H #ifndef ISC_RWLOCK_H
#define ISC_RWLOCK_H 1 #define ISC_RWLOCK_H 1
@@ -57,6 +57,7 @@ struct isc_rwlock {
unsigned int writers_waiting; unsigned int writers_waiting;
unsigned int read_quota; unsigned int read_quota;
unsigned int write_quota; unsigned int write_quota;
isc_rwlocktype_t original;
}; };
#else /* ISC_PLATFORM_USETHREADS */ #else /* ISC_PLATFORM_USETHREADS */
struct isc_rwlock { struct isc_rwlock {

22
lib/isc/rwlock.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rwlock.c,v 1.34 2003/04/17 01:56:34 marka Exp $ */ /* $Id: rwlock.c,v 1.35 2003/07/21 01:14:18 marka Exp $ */
#include <config.h> #include <config.h>
@@ -82,6 +82,7 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
rwl->magic = 0; rwl->magic = 0;
rwl->type = isc_rwlocktype_read; rwl->type = isc_rwlocktype_read;
rwl->original = isc_rwlocktype_none;
rwl->active = 0; rwl->active = 0;
rwl->granted = 0; rwl->granted = 0;
rwl->readers_waiting = 0; rwl->readers_waiting = 0;
@@ -215,9 +216,11 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) {
REQUIRE(rwl->active != 0); REQUIRE(rwl->active != 0);
/* If we are the only reader then succeed. */ /* If we are the only reader then succeed. */
if (rwl->active == 1) if (rwl->active == 1) {
rwl->original = (rwl->original == isc_rwlocktype_none) ?
isc_rwlocktype_read : isc_rwlocktype_none;
rwl->type = isc_rwlocktype_write; rwl->type = isc_rwlocktype_write;
else } else
result = ISC_R_LOCKBUSY; result = ISC_R_LOCKBUSY;
UNLOCK(&rwl->lock); UNLOCK(&rwl->lock);
@@ -233,10 +236,14 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) {
REQUIRE(rwl->active == 1); REQUIRE(rwl->active == 1);
rwl->type = isc_rwlocktype_read; rwl->type = isc_rwlocktype_read;
rwl->original = (rwl->original == isc_rwlocktype_none) ?
isc_rwlocktype_write : isc_rwlocktype_none;
/* /*
* Wake up waiting readers if there are no waiting writers. * Resume processing any read request that were blocked when
* we upgraded.
*/ */
if ((rwl->writers_waiting == 0 || rwl->granted < rwl->read_quota) && if (rwl->original == isc_rwlocktype_none &&
(rwl->writers_waiting == 0 || rwl->granted < rwl->read_quota) &&
rwl->readers_waiting > 0) rwl->readers_waiting > 0)
BROADCAST(&rwl->readable); BROADCAST(&rwl->readable);
@@ -260,6 +267,10 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
INSIST(rwl->active > 0); INSIST(rwl->active > 0);
rwl->active--; rwl->active--;
if (rwl->active == 0) { if (rwl->active == 0) {
if (rwl->original != isc_rwlocktype_none) {
rwl->type = rwl->original;
rwl->original = isc_rwlocktype_none;
}
if (rwl->type == isc_rwlocktype_read) { if (rwl->type == isc_rwlocktype_read) {
rwl->granted = 0; rwl->granted = 0;
if (rwl->writers_waiting > 0) { if (rwl->writers_waiting > 0) {
@@ -287,6 +298,7 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
} }
} }
} }
INSIST(rwl->original == isc_rwlock_none);
#ifdef ISC_RWLOCK_TRACE #ifdef ISC_RWLOCK_TRACE
print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK, print_lock(isc_msgcat_get(isc_msgcat, ISC_MSGSET_RWLOCK,