From 1d033484ee1a2ec26d3eead073e7bc0f889ffdf4 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 15 May 2018 01:47:12 -0700 Subject: fixes #419 want to nni_aio_stop without blocking (#428) * fixes #419 want to nni_aio_stop without blocking This actually introduces an nni_aio_close() API that causes nni_aio_begin to return NNG_ECLOSED, while scheduling a callback on the AIO to do an NNG_ECLOSED as well. This should be called in non-blocking close() contexts instead of nni_aio_stop(), and the cases where we call nni_aio_fini() multiple times are updated updated to add nni_aio_stop() calls on all "interlinked" aios before finalizing them. Furthermore, we call nni_aio_close() as soon as practical in the close path. This closes an annoying race condition where the callback from a lower subsystem could wind up rescheduling an operation that we wanted to abort. --- src/protocol/reqrep0/xreq.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/protocol/reqrep0/xreq.c') diff --git a/src/protocol/reqrep0/xreq.c b/src/protocol/reqrep0/xreq.c index 13ae7418..793411af 100644 --- a/src/protocol/reqrep0/xreq.c +++ b/src/protocol/reqrep0/xreq.c @@ -89,6 +89,17 @@ xreq0_sock_fini(void *arg) NNI_FREE_STRUCT(s); } +static void +xreq0_pipe_stop(void *arg) +{ + xreq0_pipe *p = arg; + + nni_aio_stop(p->aio_getq); + nni_aio_stop(p->aio_putq); + nni_aio_stop(p->aio_recv); + nni_aio_stop(p->aio_send); +} + static void xreq0_pipe_fini(void *arg) { @@ -140,17 +151,14 @@ xreq0_pipe_start(void *arg) } static void -xreq0_pipe_stop(void *arg) +xreq0_pipe_close(void *arg) { xreq0_pipe *p = arg; - nni_aio_stop(p->aio_getq); - nni_aio_stop(p->aio_putq); - nni_aio_stop(p->aio_recv); - nni_aio_stop(p->aio_send); - - // At this point there should not be any further AIOs running. - // Further, any completion tasks have completed. + nni_aio_close(p->aio_getq); + nni_aio_close(p->aio_putq); + nni_aio_close(p->aio_recv); + nni_aio_close(p->aio_send); } // For raw mode we can just let the pipes "contend" via getq to get a @@ -277,6 +285,7 @@ static nni_proto_pipe_ops xreq0_pipe_ops = { .pipe_init = xreq0_pipe_init, .pipe_fini = xreq0_pipe_fini, .pipe_start = xreq0_pipe_start, + .pipe_close = xreq0_pipe_close, .pipe_stop = xreq0_pipe_stop, }; -- cgit v1.2.3-70-g09d2