diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/aio.c | 17 | ||||
| -rw-r--r-- | src/core/aio.h | 13 | ||||
| -rw-r--r-- | src/core/endpt.c | 7 |
3 files changed, 8 insertions, 29 deletions
diff --git a/src/core/aio.c b/src/core/aio.c index 350bf52a..c6e0ed97 100644 --- a/src/core/aio.c +++ b/src/core/aio.c @@ -1,7 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> -// Copyright 2017 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -148,18 +147,6 @@ nni_aio_get_pipe(nni_aio *aio) } void -nni_aio_set_ep(nni_aio *aio, void *ep) -{ - aio->a_endpt = ep; -} - -void * -nni_aio_get_ep(nni_aio *aio) -{ - return (aio->a_endpt); -} - -void nni_aio_set_data(nni_aio *aio, int index, void *data) { if ((index >= 0) && (index < NNI_NUM_ELEMENTS(aio->a_user_data))) { diff --git a/src/core/aio.h b/src/core/aio.h index c4c09421..b5db29c9 100644 --- a/src/core/aio.h +++ b/src/core/aio.h @@ -1,7 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> -// Copyright 2017 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -47,8 +46,7 @@ struct nni_aio { nni_msg *a_msg; // Connect/accept operations. - void *a_endpt; // opaque endpoint handle - void *a_pipe; // opaque pipe handle + void *a_pipe; // opaque pipe handle // Resolver operations. nni_sockaddr *a_addr; @@ -128,14 +126,11 @@ extern void nni_aio_set_output(nni_aio *, int, void *); // nni_get_output returns an output previously stored on the AIO. extern void *nni_aio_get_output(nni_aio *, int); -// XXX: These should be refactored in terms of the generic inputs and -// outputs. +// XXX: These should be refactored in terms of generic inputs and outputs. extern void nni_aio_set_msg(nni_aio *, nni_msg *); extern nni_msg *nni_aio_get_msg(nni_aio *); extern void nni_aio_set_pipe(nni_aio *, void *); extern void * nni_aio_get_pipe(nni_aio *); -extern void nni_aio_set_ep(nni_aio *, void *); -extern void * nni_aio_get_ep(nni_aio *); // nni_aio_set_synch sets a synchronous completion flag on the AIO. // When this is set, the next time the AIO is completed, the callback diff --git a/src/core/endpt.c b/src/core/endpt.c index 3058f5c0..57e4bc62 100644 --- a/src/core/endpt.c +++ b/src/core/endpt.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -406,7 +406,6 @@ nni_ep_con_start(nni_ep *ep) return; } - nni_aio_set_ep(aio, ep->ep_data); ep->ep_ops.ep_connect(ep->ep_data, aio); } @@ -444,7 +443,6 @@ nni_ep_dial(nni_ep *ep, int flags) // Synchronous mode: so we have to wait for it to complete. aio = ep->ep_con_syn; - nni_aio_set_ep(aio, ep->ep_data); ep->ep_ops.ep_connect(ep->ep_data, aio); ep->ep_started = 1; nni_mtx_unlock(&ep->ep_mtx); @@ -509,7 +507,6 @@ nni_ep_acc_start(nni_ep *ep) return; } nni_aio_set_pipe(aio, NULL); - nni_aio_set_ep(aio, ep->ep_data); ep->ep_ops.ep_accept(ep->ep_data, aio); } |