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

maybe_cancel_validators() is always called locked

Browse Source 
there's no longer any need for a parameter to specify whether the
function is called while holding the bucket lock, because all
unlocked uses have been removed.
This commit is contained in:
Evan Hunt
2022-05-09 12:55:07 -07:00
parent e6baff35ac
commit f7fa139fe7
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/dns/resolver.c
View File

@@ -653,7 +653,7 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
static void static void
validated(isc_task_t *task, isc_event_t *event); validated(isc_task_t *task, isc_event_t *event);
static void static void
maybe_cancel_validators(fetchctx_t *fctx, bool locked); maybe_cancel_validators(fetchctx_t *fctx);
static void static void
add_bad(fetchctx_t *fctx, dns_message_t *rmessage, dns_adbaddrinfo_t *addrinfo, add_bad(fetchctx_t *fctx, dns_message_t *rmessage, dns_adbaddrinfo_t *addrinfo,
isc_result_t reason, badnstype_t badtype); isc_result_t reason, badnstype_t badtype);
@@ -4247,7 +4247,7 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
LOCK(&res->buckets[bucketnum].lock); LOCK(&res->buckets[bucketnum].lock);
if (SHUTTINGDOWN(fctx)) { if (SHUTTINGDOWN(fctx)) {
maybe_cancel_validators(fctx, true); maybe_cancel_validators(fctx);
UNLOCK(&res->buckets[bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
fctx_detach(&fctx); fctx_detach(&fctx);
return; return;
@@ -5237,27 +5237,21 @@ clone_results(fetchctx_t *fctx) {
/* /*
* Cancel validators associated with '*fctx' if it is ready to be * Cancel validators associated with '*fctx' if it is ready to be
* destroyed (i.e., no queries waiting for it and no pending ADB finds). * destroyed (i.e., no queries waiting for it and no pending ADB finds).
* Caller must hold fctx bucket lock.
* *
* Requires: * Requires:
* '*fctx' is shutting down. * '*fctx' is shutting down.
*/ */
static void static void
maybe_cancel_validators(fetchctx_t *fctx, bool locked) { maybe_cancel_validators(fetchctx_t *fctx) {
unsigned int bucketnum; dns_validator_t *validator = NULL, *next_validator = NULL;
dns_resolver_t *res = fctx->res;
dns_validator_t *validator, *next_validator;
bucketnum = fctx->bucketnum;
if (!locked) {
LOCK(&res->buckets[bucketnum].lock);
}
REQUIRE(SHUTTINGDOWN(fctx)); REQUIRE(SHUTTINGDOWN(fctx));
if (atomic_load_acquire(&fctx->pending) != 0 || if (atomic_load_acquire(&fctx->pending) != 0 ||
atomic_load_acquire(&fctx->nqueries) != 0) atomic_load_acquire(&fctx->nqueries) != 0)
{ {
goto unlock; return;
} }
for (validator = ISC_LIST_HEAD(fctx->validators); validator != NULL; for (validator = ISC_LIST_HEAD(fctx->validators); validator != NULL;
@@ -5266,10 +5260,6 @@ maybe_cancel_validators(fetchctx_t *fctx, bool locked) {
next_validator = ISC_LIST_NEXT(validator, link); next_validator = ISC_LIST_NEXT(validator, link);
dns_validator_cancel(validator); dns_validator_cancel(validator);
} }
unlock:
if (!locked) {
UNLOCK(&res->buckets[bucketnum].lock);
}
} }
/* /*
@@ -5707,7 +5697,7 @@ validated(isc_task_t *task, isc_event_t *event) {
*/ */
dns_db_detachnode(fctx->cache, &node); dns_db_detachnode(fctx->cache, &node);
if (SHUTTINGDOWN(fctx)) { if (SHUTTINGDOWN(fctx)) {
maybe_cancel_validators(fctx, true); maybe_cancel_validators(fctx);
} }
UNLOCK(&res->buckets[bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
fctx_detach(&fctx); fctx_detach(&fctx);
@@ -7314,7 +7304,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
LOCK(&res->buckets[fctx->bucketnum].lock); LOCK(&res->buckets[fctx->bucketnum].lock);
if (SHUTTINGDOWN(fctx)) { if (SHUTTINGDOWN(fctx)) {
maybe_cancel_validators(fctx, true); maybe_cancel_validators(fctx);
UNLOCK(&res->buckets[fctx->bucketnum].lock); UNLOCK(&res->buckets[fctx->bucketnum].lock);
if (dns_rdataset_isassociated(frdataset)) { if (dns_rdataset_isassociated(frdataset)) {