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/pubsub0/sub.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/protocol/pubsub0/sub.c') diff --git a/src/protocol/pubsub0/sub.c b/src/protocol/pubsub0/sub.c index b41b33ea..c244b0ad 100644 --- a/src/protocol/pubsub0/sub.c +++ b/src/protocol/pubsub0/sub.c @@ -98,6 +98,15 @@ sub0_sock_close(void *arg) NNI_ARG_UNUSED(arg); } +static void +sub0_pipe_stop(void *arg) +{ + sub0_pipe *p = arg; + + nni_aio_stop(p->aio_putq); + nni_aio_stop(p->aio_recv); +} + static void sub0_pipe_fini(void *arg) { @@ -139,12 +148,12 @@ sub0_pipe_start(void *arg) } static void -sub0_pipe_stop(void *arg) +sub0_pipe_close(void *arg) { sub0_pipe *p = arg; - nni_aio_stop(p->aio_putq); - nni_aio_stop(p->aio_recv); + nni_aio_close(p->aio_putq); + nni_aio_close(p->aio_recv); } static void @@ -338,6 +347,7 @@ static nni_proto_pipe_ops sub0_pipe_ops = { .pipe_init = sub0_pipe_init, .pipe_fini = sub0_pipe_fini, .pipe_start = sub0_pipe_start, + .pipe_close = sub0_pipe_close, .pipe_stop = sub0_pipe_stop, }; -- cgit v1.2.3-70-g09d2