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/pipeline0/pull.c | 16 +++++++++++++--- src/protocol/pipeline0/push.c | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-) (limited to 'src/protocol/pipeline0') diff --git a/src/protocol/pipeline0/pull.c b/src/protocol/pipeline0/pull.c index c5017d50..81f6c137 100644 --- a/src/protocol/pipeline0/pull.c +++ b/src/protocol/pipeline0/pull.c @@ -67,6 +67,15 @@ pull0_sock_fini(void *arg) NNI_FREE_STRUCT(s); } +static void +pull0_pipe_stop(void *arg) +{ + pull0_pipe *p = arg; + + nni_aio_stop(p->putq_aio); + nni_aio_stop(p->recv_aio); +} + static void pull0_pipe_fini(void *arg) { @@ -110,12 +119,12 @@ pull0_pipe_start(void *arg) } static void -pull0_pipe_stop(void *arg) +pull0_pipe_close(void *arg) { pull0_pipe *p = arg; - nni_aio_stop(p->putq_aio); - nni_aio_stop(p->recv_aio); + nni_aio_close(p->putq_aio); + nni_aio_close(p->recv_aio); } static void @@ -198,6 +207,7 @@ static nni_proto_pipe_ops pull0_pipe_ops = { .pipe_init = pull0_pipe_init, .pipe_fini = pull0_pipe_fini, .pipe_start = pull0_pipe_start, + .pipe_close = pull0_pipe_close, .pipe_stop = pull0_pipe_stop, }; diff --git a/src/protocol/pipeline0/push.c b/src/protocol/pipeline0/push.c index 2ad657b6..e413cf46 100644 --- a/src/protocol/pipeline0/push.c +++ b/src/protocol/pipeline0/push.c @@ -82,6 +82,16 @@ push0_sock_close(void *arg) NNI_ARG_UNUSED(arg); } +static void +push0_pipe_stop(void *arg) +{ + push0_pipe *p = arg; + + nni_aio_stop(p->aio_recv); + nni_aio_stop(p->aio_send); + nni_aio_stop(p->aio_getq); +} + static void push0_pipe_fini(void *arg) { @@ -136,13 +146,13 @@ push0_pipe_start(void *arg) } static void -push0_pipe_stop(void *arg) +push0_pipe_close(void *arg) { push0_pipe *p = arg; - nni_aio_stop(p->aio_recv); - nni_aio_stop(p->aio_send); - nni_aio_stop(p->aio_getq); + nni_aio_close(p->aio_recv); + nni_aio_close(p->aio_send); + nni_aio_close(p->aio_getq); } static void @@ -214,6 +224,7 @@ static nni_proto_pipe_ops push0_pipe_ops = { .pipe_init = push0_pipe_init, .pipe_fini = push0_pipe_fini, .pipe_start = push0_pipe_start, + .pipe_close = push0_pipe_close, .pipe_stop = push0_pipe_stop, }; -- cgit v1.2.3-70-g09d2