mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'ondrej-cleanup-nm_destroy-dequeue' into 'main'

Browse Source 
Properly free up enqueued netievents in nm_destroy()

See merge request isc-projects/bind9!5888
This commit is contained in:
Ondřej Surý
2022-02-23 21:52:49 +00:00
parent e42d5d8875 88418c3372
commit 713444e51a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/isc/netmgr/netmgr.c
View File

@@ -372,14 +372,14 @@ nm_destroy(isc_nm_t **mgr0) {
/* Empty the async event queues */ /* Empty the async event queues */
while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) { while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) {
isc_mem_put(mgr->mctx, ievent, sizeof(*ievent)); isc__nm_put_netievent(mgr, ievent);
} }
INSIST(DEQUEUE_PRIVILEGED_NETIEVENT(worker) == NULL); INSIST(DEQUEUE_PRIVILEGED_NETIEVENT(worker) == NULL);
INSIST(DEQUEUE_TASK_NETIEVENT(worker) == NULL); INSIST(DEQUEUE_TASK_NETIEVENT(worker) == NULL);
while ((ievent = DEQUEUE_PRIORITY_NETIEVENT(worker)) != NULL) { while ((ievent = DEQUEUE_NORMAL_NETIEVENT(worker)) != NULL) {
isc_mem_put(mgr->mctx, ievent, sizeof(*ievent)); isc__nm_put_netievent(mgr, ievent);
} }
isc_condition_destroy(&worker->cond_prio); isc_condition_destroy(&worker->cond_prio);
isc_mutex_destroy(&worker->lock); isc_mutex_destroy(&worker->lock);