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

Merge branch 'ondrej/dereference-taskmgr-after-all-tasks-are-done' into 'main'

Browse Source 
Destroy reference to taskmgr after all tasks are done

See merge request isc-projects/bind9!5008
This commit is contained in:
Ondřej Surý
2021-05-10 19:24:53 +00:00
parent d3ebd19e23 e623c12757
commit 1639bcb59e
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/isc/task.c
View File

@@ -1074,26 +1074,22 @@ isc__taskmgr_shutdown(isc_taskmgr_t *manager) {
void void
isc__taskmgr_destroy(isc_taskmgr_t **managerp) { isc__taskmgr_destroy(isc_taskmgr_t **managerp) {
REQUIRE(managerp != NULL && VALID_MANAGER(*managerp)); REQUIRE(managerp != NULL && VALID_MANAGER(*managerp));
isc_taskmgr_t *manager = *managerp;
*managerp = NULL;
XTHREADTRACE("isc_taskmgr_destroy"); XTHREADTRACE("isc_taskmgr_destroy");
#ifdef ISC_TASK_TRACE #ifdef ISC_TASK_TRACE
int counter = 0; int counter = 0;
while (isc_refcount_current(&manager->references) > 1 && while (isc_refcount_current(&(*managerp)->references) > 1 &&
counter++ < 1000) { counter++ < 1000) {
usleep(10 * 1000); usleep(10 * 1000);
} }
INSIST(counter < 1000);
#else #else
while (isc_refcount_current(&manager->references) > 1) { while (isc_refcount_current(&(*managerp)->references) > 1) {
usleep(10 * 1000); usleep(10 * 1000);
} }
#endif #endif
REQUIRE(isc_refcount_decrement(&manager->references) == 1); isc_taskmgr_detach(managerp);
manager_free(manager);
} }
void void