From ae944a8de32c107eea9427104e153c25e4a681f1 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 6 Aug 2018 19:01:12 +0300 Subject: Revert "fixes #599 nng_dial sync should not return until added to socket" This changeset needs work. We are seeing errors described by This reverts commit d7f7c896c0ede24249ef63b1e45b1878bf4bd473. --- src/core/aio.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/core/aio.c') diff --git a/src/core/aio.c b/src/core/aio.c index 294a0b92..40638bce 100644 --- a/src/core/aio.c +++ b/src/core/aio.c @@ -217,17 +217,11 @@ void nni_aio_stop(nni_aio *aio) { if (aio != NULL) { - nni_aio_cancelfn cancelfn; - nni_mtx_lock(&nni_aio_lk); - cancelfn = aio->a_prov_cancel; - aio->a_prov_cancel = NULL; - aio->a_stop = true; + aio->a_stop = true; nni_mtx_unlock(&nni_aio_lk); - if (cancelfn != NULL) { - cancelfn(aio, NNG_ECANCELED); - } + nni_aio_abort(aio, NNG_ECANCELED); nni_aio_wait(aio); } -- cgit v1.2.3-70-g09d2