From c61104f3abc73867e5460ec0686c4b51ab58899d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 5 May 2021 13:23:25 +0200 Subject: [PATCH] fixup! Use barriers for netmgr synchronization --- lib/isc/netmgr/tlsstream.c | 2 +- lib/isc/task.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c index 73d217646b..a2a1567286 100644 --- a/lib/isc/netmgr/tlsstream.c +++ b/lib/isc/netmgr/tlsstream.c @@ -662,7 +662,7 @@ isc_nm_listentls(isc_nm_t *mgr, isc_nmiface_t *iface, /* wait for listen result */ isc__nmsocket_attach(tlssock->outer, &tsock); LOCK(&tlssock->outer->lock); - while (tlssock->outer->rchildren != tlssock->outer->nchildren) { + while (atomic_load(&tlssock->outer->rchildren) != tlssock->outer->nchildren) { WAIT(&tlssock->outer->cond, &tlssock->outer->lock); } result = tlssock->outer->result; diff --git a/lib/isc/task.c b/lib/isc/task.c index 346b8e660f..e8210d149a 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -997,7 +997,7 @@ isc__taskmgr_shutdown(isc_taskmgr_t *manager) { REQUIRE(VALID_MANAGER(manager)); - XTHREADTRACE(e "isc_taskmgr_shutdown"); + XTHREADTRACE("isc_taskmgr_shutdown"); /* * Only one non-worker thread may ever call this routine. * If a worker thread wants to initiate shutdown of the