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/transport | |
| 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/transport')
| -rw-r--r-- | src/transport/ipc/ipc.c | 5 | ||||
| -rw-r--r-- | src/transport/tcp/tcp.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c index 65266ccc..b2b9c438 100644 --- a/src/transport/ipc/ipc.c +++ b/src/transport/ipc/ipc.c @@ -86,6 +86,10 @@ nni_ipc_pipe_fini(void *arg) { nni_ipc_pipe *pipe = arg; + nni_aio_stop(&pipe->rxaio); + nni_aio_stop(&pipe->txaio); + nni_aio_stop(&pipe->negaio); + nni_aio_fini(&pipe->rxaio); nni_aio_fini(&pipe->txaio); nni_aio_fini(&pipe->negaio); @@ -462,6 +466,7 @@ nni_ipc_ep_fini(void *arg) { nni_ipc_ep *ep = arg; + nni_aio_stop(&ep->aio); nni_plat_ipc_ep_fini(ep->iep); nni_aio_fini(&ep->aio); nni_mtx_fini(&ep->mtx); diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c index 13d5716a..1bd42cec 100644 --- a/src/transport/tcp/tcp.c +++ b/src/transport/tcp/tcp.c @@ -86,6 +86,10 @@ nni_tcp_pipe_fini(void *arg) { nni_tcp_pipe *pipe = arg; + nni_aio_stop(&pipe->rxaio); + nni_aio_stop(&pipe->txaio); + nni_aio_stop(&pipe->negaio); + nni_aio_fini(&pipe->rxaio); nni_aio_fini(&pipe->txaio); nni_aio_fini(&pipe->negaio); @@ -530,6 +534,7 @@ nni_tcp_ep_fini(void *arg) { nni_tcp_ep *ep = arg; + nni_aio_stop(&ep->aio); if (ep->tep != NULL) { nni_plat_tcp_ep_fini(ep->tep); } |