ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '84-destroy-task-first-when-destroying-rpzs' into 'master'

Browse Source 
Destroy updater task first when destroying rpzs.

Closes #84

See merge request isc-projects/bind9!944
This commit is contained in:
Ondřej Surý
2018-10-30 09:02:02 -04:00
parent faa52a704f 19c4fe93c4
commit 29e7501bef
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -1,3 +1,6 @@
5073. [bug] Destroy a task first when destroying rpzs and catzs.
[GL #84]
5072. [bug] Add unit tests for isc_buffer_copyregion() and fix its
behavior for auto-reallocated buffers. [GL #644]
lib/dns/catz.c
+2 -2
View File
@@ -795,7 +795,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
*catzsp = NULL;
if (isc_refcount_decrement(&catzs->refs) == 1) {
isc_refcount_destroy(&catzs->refs);
isc_task_destroy(&catzs->updater);
DESTROYLOCK(&catzs->lock);
if (catzs->zones != NULL) {
isc_ht_iter_t *iter = NULL;
@@ -815,7 +815,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
INSIST(isc_ht_count(catzs->zones) == 0);
isc_ht_destroy(&catzs->zones);
}
isc_task_destroy(&catzs->updater);
isc_refcount_destroy(&catzs->refs);
isc_mem_putanddetach(&catzs->mctx, catzs, sizeof(*catzs));
}
}
lib/dns/rpz.c
+7 -2
View File
@@ -2148,7 +2148,12 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) {
*rpzsp = NULL;
if (isc_refcount_decrement(&rpzs->refs) == 1) {
isc_refcount_destroy(&rpzs->refs);
/*
* Destroy the task first, so that nothing runs
* in the background that might race with us.
*/
isc_task_destroy(&rpzs->updater);
/*
* Forget the last of view's rpz machinery after
* the last reference.
@@ -2178,7 +2183,7 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) {
}
DESTROYLOCK(&rpzs->maint_lock);
isc_rwlock_destroy(&rpzs->search_lock);
isc_task_destroy(&rpzs->updater);
isc_refcount_destroy(&rpzs->refs);
isc_mem_putanddetach(&rpzs->mctx, rpzs, sizeof(*rpzs));
}
}