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

Add isc_taskmgr_detach when task is created while shutting down

Browse Source 
When taskmgr is shutting down, the creating the task would attach
to the taskmgr, but don't detach on error condition.
This commit is contained in:
Ondřej Surý
2021-05-10 11:36:54 +02:00
parent 0e92060833
commit 6c57a6cc3d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/include/isc/task.h
View File

@@ -644,7 +644,7 @@ isc_task_privileged(isc_task_t *task);
void
isc_taskmgr_attach(isc_taskmgr_t *, isc_taskmgr_t **);
void
isc_taskmgr_detach(isc_taskmgr_t *);
isc_taskmgr_detach(isc_taskmgr_t **);
/*%<
* Attach/detach the task manager.
*/

11
lib/isc/task.c
View File

@@ -193,7 +193,7 @@ task_finished(isc_task_t *task) {
task->magic = 0;
isc_mem_put(mctx, task, sizeof(*task));
isc_taskmgr_detach(manager);
isc_taskmgr_detach(&manager);
}
isc_result_t
@@ -265,6 +265,7 @@ isc_task_create_bound(isc_taskmgr_t *manager, unsigned int quantum,
if (exiting) {
isc_mutex_destroy(&task->lock);
isc_taskmgr_detach(&task->manager);
isc_mem_put(manager->mctx, task, sizeof(*task));
return (ISC_R_SHUTTINGDOWN);
}
@@ -959,8 +960,12 @@ isc_taskmgr_attach(isc_taskmgr_t *source, isc_taskmgr_t **targetp) {
}
void
isc_taskmgr_detach(isc_taskmgr_t *manager) {
REQUIRE(VALID_MANAGER(manager));
isc_taskmgr_detach(isc_taskmgr_t **managerp) {
REQUIRE(managerp != NULL);
REQUIRE(VALID_MANAGER(*managerp));
isc_taskmgr_t *manager = *managerp;
*managerp = NULL;
if (isc_refcount_decrement(&manager->references) == 1) {
manager_free(manager);