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

attempt to silence leaked lock false positive

Browse Source
This commit is contained in:
Mark Andrews
2014-06-04 14:07:16 +10:00
parent 7cce33eb78
commit b925be3e54
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/dns/resolver.c
View File

@@ -4291,6 +4291,7 @@ validated(isc_task_t *task, isc_event_t *event) {
isc_stdtime_t now; isc_stdtime_t now;
isc_uint32_t ttl; isc_uint32_t ttl;
unsigned options; unsigned options;
isc_uint32_t bucketnum;
UNUSED(task); /* for now */ UNUSED(task); /* for now */
@@ -4307,7 +4308,8 @@ validated(isc_task_t *task, isc_event_t *event) {
FCTXTRACE("received validation completion event"); FCTXTRACE("received validation completion event");
LOCK(&res->buckets[fctx->bucketnum].lock); bucketnum = fctx->bucketnum;
LOCK(&res->buckets[bucketnum].lock);
ISC_LIST_UNLINK(fctx->validators, vevent->validator, link); ISC_LIST_UNLINK(fctx->validators, vevent->validator, link);
fctx->validator = NULL; fctx->validator = NULL;
@@ -4329,7 +4331,6 @@ validated(isc_task_t *task, isc_event_t *event) {
* so, destroy the fctx. * so, destroy the fctx.
*/ */
if (SHUTTINGDOWN(fctx) && !sentresponse) { if (SHUTTINGDOWN(fctx) && !sentresponse) {
isc_uint32_t bucketnum = fctx->bucketnum;
isc_boolean_t bucket_empty; isc_boolean_t bucket_empty;
bucket_empty = maybe_destroy(fctx, ISC_TRUE); bucket_empty = maybe_destroy(fctx, ISC_TRUE);
UNLOCK(&res->buckets[bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
@@ -4432,7 +4433,7 @@ validated(isc_task_t *task, isc_event_t *event) {
result = fctx->vresult; result = fctx->vresult;
add_bad(fctx, addrinfo, result, badns_validation); add_bad(fctx, addrinfo, result, badns_validation);
isc_event_free(&event); isc_event_free(&event);
UNLOCK(&res->buckets[fctx->bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
INSIST(fctx->validator == NULL); INSIST(fctx->validator == NULL);
fctx->validator = ISC_LIST_HEAD(fctx->validators); fctx->validator = ISC_LIST_HEAD(fctx->validators);
if (fctx->validator != NULL) if (fctx->validator != NULL)
@@ -4563,7 +4564,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))
bucket_empty = maybe_destroy(fctx, ISC_TRUE); bucket_empty = maybe_destroy(fctx, ISC_TRUE);
UNLOCK(&res->buckets[fctx->bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
if (bucket_empty) if (bucket_empty)
empty_bucket(res); empty_bucket(res);
goto cleanup_event; goto cleanup_event;
@@ -4580,7 +4581,7 @@ validated(isc_task_t *task, isc_event_t *event) {
* be validated. * be validated.
*/ */
dns_db_detachnode(fctx->cache, &node); dns_db_detachnode(fctx->cache, &node);
UNLOCK(&res->buckets[fctx->bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
dns_validator_send(ISC_LIST_HEAD(fctx->validators)); dns_validator_send(ISC_LIST_HEAD(fctx->validators));
goto cleanup_event; goto cleanup_event;
} }
@@ -4663,7 +4664,7 @@ validated(isc_task_t *task, isc_event_t *event) {
if (node != NULL) if (node != NULL)
dns_db_detachnode(fctx->cache, &node); dns_db_detachnode(fctx->cache, &node);
UNLOCK(&res->buckets[fctx->bucketnum].lock); UNLOCK(&res->buckets[bucketnum].lock);
fctx_done(fctx, result, __LINE__); /* Locks bucket. */ fctx_done(fctx, result, __LINE__); /* Locks bucket. */
cleanup_event: cleanup_event: