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/survey0/survey.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/protocol/survey0/survey.c') diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c index e725d2b3..51bce0c8 100644 --- a/src/protocol/survey0/survey.c +++ b/src/protocol/survey0/survey.c @@ -283,6 +283,16 @@ surv0_sock_close(void *arg) nni_msgq_close(s->ctx->rq); } +static void +surv0_pipe_stop(void *arg) +{ + surv0_pipe *p = arg; + + nni_aio_stop(p->aio_getq); + nni_aio_stop(p->aio_send); + nni_aio_stop(p->aio_recv); +} + static void surv0_pipe_fini(void *arg) { @@ -338,14 +348,14 @@ surv0_pipe_start(void *arg) } static void -surv0_pipe_stop(void *arg) +surv0_pipe_close(void *arg) { surv0_pipe *p = arg; surv0_sock *s = p->sock; - nni_aio_stop(p->aio_getq); - nni_aio_stop(p->aio_send); - nni_aio_stop(p->aio_recv); + nni_aio_close(p->aio_getq); + nni_aio_close(p->aio_send); + nni_aio_close(p->aio_recv); nni_msgq_close(p->sendq); @@ -532,6 +542,7 @@ static nni_proto_pipe_ops surv0_pipe_ops = { .pipe_init = surv0_pipe_init, .pipe_fini = surv0_pipe_fini, .pipe_start = surv0_pipe_start, + .pipe_close = surv0_pipe_close, .pipe_stop = surv0_pipe_stop, }; -- cgit v1.2.3-70-g09d2