diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-08-06 19:01:12 +0300 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-08-06 19:01:12 +0300 |
| commit | ae944a8de32c107eea9427104e153c25e4a681f1 (patch) | |
| tree | 7029f7668fe3e1a9899da57bf6c1e60e0394bacb /src/core/aio.c | |
| parent | d7f7c896c0ede24249ef63b1e45b1878bf4bd473 (diff) | |
| download | nng-ae944a8de32c107eea9427104e153c25e4a681f1.tar.gz nng-ae944a8de32c107eea9427104e153c25e4a681f1.tar.bz2 nng-ae944a8de32c107eea9427104e153c25e4a681f1.zip | |
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.
Diffstat (limited to 'src/core/aio.c')
| -rw-r--r-- | src/core/aio.c | 10 |
1 files changed, 2 insertions, 8 deletions
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); } |