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/zerotier/zerotier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/transport/zerotier') diff --git a/src/transport/zerotier/zerotier.c b/src/transport/zerotier/zerotier.c index f7139b94..46fe476e 100644 --- a/src/transport/zerotier/zerotier.c +++ b/src/transport/zerotier/zerotier.c @@ -2182,7 +2182,7 @@ zt_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode) ep->ze_ping_time = zt_ping_time; ep->ze_conn_time = zt_conn_time; ep->ze_conn_tries = zt_conn_tries; - ep->ze_proto = nni_sock_proto(sock); + ep->ze_proto = nni_sock_proto_id(sock); nni_aio_list_init(&ep->ze_aios); @@ -2888,7 +2888,7 @@ static nni_tran_pipe_option zt_pipe_options[] = { }, }; -static nni_tran_pipe zt_pipe_ops = { +static nni_tran_pipe_ops zt_pipe_ops = { .p_fini = zt_pipe_fini, .p_start = zt_pipe_start, .p_send = zt_pipe_send, @@ -2983,7 +2983,7 @@ static nni_tran_ep_option zt_ep_options[] = { }, }; -static nni_tran_ep zt_ep_ops = { +static nni_tran_ep_ops zt_ep_ops = { .ep_init = zt_ep_init, .ep_fini = zt_ep_fini, .ep_connect = zt_ep_connect, -- cgit v1.2.3-70-g09d2