mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

make sure zone manager is not destroyed until tasks have finished;

Browse Source 
eliminated 'soaquery' struct
This commit is contained in:
Andreas Gustafsson
2000-01-19 22:01:57 +00:00
parent f78d0a48d8
commit ea80934b58
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dns/include/dns/zone.h
View File

@@ -805,6 +805,12 @@ dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr);
* earliest conveniene. * earliest conveniene.
*/ */
void
dns_zonemgr_shutdown(dns_zonemgr_t *zmgr);
/*
* Shut down and detach the task of the zone manager.
*/
void void
dns_zonemgr_destroy(dns_zonemgr_t **zmgrp); dns_zonemgr_destroy(dns_zonemgr_t **zmgrp);
/* /*

27
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: zone.c,v 1.55 2000/01/06 23:33:20 halley Exp $ */ /* $Id: zone.c,v 1.56 2000/01/19 22:01:54 gson Exp $ */
#include <config.h> #include <config.h>
@@ -183,9 +183,7 @@ struct dns_zonemgr {
isc_timermgr_t * timermgr; isc_timermgr_t * timermgr;
isc_socketmgr_t * socketmgr; isc_socketmgr_t * socketmgr;
isc_taskpool_t * zonetasks; isc_taskpool_t * zonetasks;
struct soaquery { isc_task_t * task;
isc_task_t * task;
} soaquery;
isc_rwlock_t rwlock; isc_rwlock_t rwlock;
/* Locked by rwlock. */ /* Locked by rwlock. */
ISC_LIST(dns_zone_t) zones; ISC_LIST(dns_zone_t) zones;
@@ -2982,7 +2980,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
zmgr->timermgr = timermgr; zmgr->timermgr = timermgr;
zmgr->socketmgr = socketmgr; zmgr->socketmgr = socketmgr;
zmgr->zonetasks = NULL; zmgr->zonetasks = NULL;
zmgr->soaquery.task = NULL; zmgr->task = NULL;
ISC_LIST_INIT(zmgr->zones); ISC_LIST_INIT(zmgr->zones);
result = isc_rwlock_init(&zmgr->rwlock, 0, 0); result = isc_rwlock_init(&zmgr->rwlock, 0, 0);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -3000,7 +2998,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
goto failure; goto failure;
/* Create a single task for queueing of SOA queries. */ /* Create a single task for queueing of SOA queries. */
result = isc_task_create(taskmgr, mctx, 1, &zmgr->soaquery.task); result = isc_task_create(taskmgr, mctx, 1, &zmgr->task);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto failure; goto failure;
@@ -3031,7 +3029,7 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
result = isc_timer_create(zmgr->timermgr, isc_timertype_inactive, result = isc_timer_create(zmgr->timermgr, isc_timertype_inactive,
NULL, NULL, NULL, NULL,
zmgr->soaquery.task, zone_timer, zone, zmgr->task, zone_timer, zone,
&zone->timer); &zone->timer);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto failure; goto failure;
@@ -3086,6 +3084,14 @@ dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) {
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
void
dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) {
if (zmgr->task != NULL)
isc_task_destroy(&zmgr->task);
if (zmgr->zonetasks != NULL)
isc_taskpool_destroy(&zmgr->zonetasks);
}
void void
dns_zonemgr_destroy(dns_zonemgr_t **zmgrp) { dns_zonemgr_destroy(dns_zonemgr_t **zmgrp) {
dns_zonemgr_t *zmgr = *zmgrp; dns_zonemgr_t *zmgr = *zmgrp;
@@ -3101,10 +3107,9 @@ dns_zonemgr_destroy(dns_zonemgr_t **zmgrp) {
} }
RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write); RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);
if (zmgr->soaquery.task != NULL) /* Probably done already, but does not hurt to repeat. */
isc_task_destroy(&zmgr->soaquery.task); dns_zonemgr_shutdown(zmgr);
if (zmgr->zonetasks != NULL)
isc_taskpool_destroy(&zmgr->zonetasks);
isc_rwlock_destroy(&zmgr->rwlock); isc_rwlock_destroy(&zmgr->rwlock);
isc_mem_put(zmgr->mctx, zmgr, sizeof *zmgr); isc_mem_put(zmgr->mctx, zmgr, sizeof *zmgr);
*zmgrp = NULL; *zmgrp = NULL;