diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-07-20 14:34:51 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-07-20 14:34:51 -0700 |
| commit | a37093079b492e966344416445aae354b147d30e (patch) | |
| tree | 2f21fc2bc716f2423ba02f4713b25038c429ec4e /src/protocol/reqrep/rep.c | |
| parent | 88fb04f61918b06e6e269c1960058c3df5e0a0ef (diff) | |
| download | nng-a37093079b492e966344416445aae354b147d30e.tar.gz nng-a37093079b492e966344416445aae354b147d30e.tar.bz2 nng-a37093079b492e966344416445aae354b147d30e.zip | |
Yet more race condition fixes.
We need to remember that protocol stops can run synchronously, and
therefore we need to wait for the aio to complete. Further, we need
to break apart shutting down aio activity from deallocation, as we need
to shut down *all* async activity before deallocating *anything*.
Noticed that we had a pipe race in the surveyor pattern too.
Diffstat (limited to 'src/protocol/reqrep/rep.c')
| -rw-r--r-- | src/protocol/reqrep/rep.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c index 013b02fb..049b1422 100644 --- a/src/protocol/reqrep/rep.c +++ b/src/protocol/reqrep/rep.c @@ -56,6 +56,7 @@ nni_rep_sock_fini(void *arg) { nni_rep_sock *rep = arg; + nni_aio_stop(&rep->aio_getq); nni_aio_fini(&rep->aio_getq); nni_idhash_fini(rep->pipes); if (rep->btrace != NULL) { @@ -192,10 +193,10 @@ nni_rep_pipe_stop(void *arg) nni_rep_sock *rep = rp->rep; nni_msgq_close(rp->sendq); - nni_aio_cancel(&rp->aio_getq, NNG_ECANCELED); - nni_aio_cancel(&rp->aio_putq, NNG_ECANCELED); - nni_aio_cancel(&rp->aio_send, NNG_ECANCELED); - nni_aio_cancel(&rp->aio_recv, NNG_ECANCELED); + nni_aio_stop(&rp->aio_getq); + nni_aio_stop(&rp->aio_send); + nni_aio_stop(&rp->aio_recv); + nni_aio_stop(&rp->aio_putq); nni_idhash_remove(rep->pipes, nni_pipe_id(rp->pipe)); } |