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/transport/tcp/tcp.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/transport/tcp') diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c index f2cdf8ac..22217699 100644 --- a/src/transport/tcp/tcp.c +++ b/src/transport/tcp/tcp.c @@ -81,9 +81,13 @@ nni_tcp_tran_fini(void) static void nni_tcp_pipe_close(void *arg) { - nni_tcp_pipe *pipe = arg; + nni_tcp_pipe *p = arg; + + nni_aio_close(p->rxaio); + nni_aio_close(p->txaio); + nni_aio_close(p->negaio); - nni_plat_tcp_pipe_close(pipe->tpp); + nni_plat_tcp_pipe_close(p->tpp); } static void @@ -666,7 +670,7 @@ nni_tcp_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode) nni_tcp_ep_fini(ep); return (rv); } - ep->proto = nni_sock_proto(sock); + ep->proto = nni_sock_proto_id(sock); ep->mode = mode; ep->nodelay = true; ep->keepalive = false; @@ -680,11 +684,11 @@ nni_tcp_ep_close(void *arg) { nni_tcp_ep *ep = arg; + nni_aio_close(ep->aio); + nni_mtx_lock(&ep->mtx); nni_plat_tcp_ep_close(ep->tep); nni_mtx_unlock(&ep->mtx); - - nni_aio_stop(ep->aio); } static int @@ -910,7 +914,7 @@ static nni_tran_pipe_option nni_tcp_pipe_options[] = { }, }; -static nni_tran_pipe nni_tcp_pipe_ops = { +static nni_tran_pipe_ops nni_tcp_pipe_ops = { .p_fini = nni_tcp_pipe_fini, .p_start = nni_tcp_pipe_start, .p_send = nni_tcp_pipe_send, @@ -951,7 +955,7 @@ static nni_tran_ep_option nni_tcp_ep_options[] = { }, }; -static nni_tran_ep nni_tcp_ep_ops = { +static nni_tran_ep_ops nni_tcp_ep_ops = { .ep_init = nni_tcp_ep_init, .ep_fini = nni_tcp_ep_fini, .ep_connect = nni_tcp_ep_connect, -- cgit v1.2.3-70-g09d2