From 71e459eea31e9e47c0ce64a78e32b242d357f9a0 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 7 Dec 2024 11:44:22 -0800 Subject: fini: add drain mechanism for aio, reap, and task subsystems Make sure *everything* is drained before proceeding all the way to deallocation. --- src/core/aio.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/core/aio.c') diff --git a/src/core/aio.c b/src/core/aio.c index 5807869b..bb8347dd 100644 --- a/src/core/aio.c +++ b/src/core/aio.c @@ -780,15 +780,21 @@ nni_sleep_aio(nng_duration ms, nng_aio *aio) } } -static void +static bool nni_aio_expire_q_stop(nni_aio_expire_q *eq) { - if (eq != NULL && !eq->eq_stop) { + bool result = false; + if (eq != NULL) { nni_mtx_lock(&eq->eq_mtx); eq->eq_stop = true; nni_cv_wake(&eq->eq_cv); + while (!nni_list_empty(&eq->eq_list)) { + result = true; + nni_cv_wait(&eq->eq_cv); + } nni_mtx_unlock(&eq->eq_mtx); } + return (result); } static void @@ -834,12 +840,16 @@ nni_aio_expire_q_alloc(void) return (eq); } -void -nni_aio_sys_stop(void) +bool +nni_aio_sys_drain(void) { + bool result = false; for (int i = 0; i < nni_aio_expire_q_cnt; i++) { - nni_aio_expire_q_stop(nni_aio_expire_q_list[i]); + if (nni_aio_expire_q_stop(nni_aio_expire_q_list[i])) { + result = true; + } } + return (result); } void -- cgit v1.2.3-70-g09d2