upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-25 02:42:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Access netmgr worker->finished under worker lock only

Browse source 
- Join network worker thread to silence tsan
This commit is contained in:
Witold Kręcicki 2019-11-26 15:21:25 +01:00
parent d0bc45be17
commit bf2cc19b04
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/isc/netmgr/netmgr.c
View file

@ -198,6 +198,7 @@ nm_destroy(isc_nm_t **mgr0) {
int r = uv_loop_close(&mgr->workers[i].loop);
INSIST(r == 0);
isc_queue_destroy(mgr->workers[i].ievents);
isc_thread_join(mgr->workers[i].thread, NULL);
}
isc_condition_destroy(&mgr->wkstatecond);
@ -424,9 +425,10 @@ nm_thread(void *worker0) {
atomic_store(&worker->mgr->paused, false);
}
}
bool finished = worker->finished;
UNLOCK(&worker->lock);
if (worker->finished) {
if (finished) {
/*
* We need to launch the loop one more time
* in UV_RUN_NOWAIT mode to make sure that