From 343417234aa3fd86e8ae0b56ae500a1ed3411cfc Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 12 Aug 2017 12:24:54 -0700 Subject: fixes #62 Endpoint close should be synchronous #62 fixes #66 Make pipe and endpoint structures private This changes a number of things, refactoring endpoints and supporting code to keep their internals private, and making endpoint close synchronous. This will allow us to add a consumer facing API for nng_ep_close(), as well as property APIs, etc. While here a bunch of convoluted and dead code was cleaned up. --- src/core/endpt.h | 70 +++++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 49 deletions(-) (limited to 'src/core/endpt.h') diff --git a/src/core/endpt.h b/src/core/endpt.h index 5a923bd5..fbb10911 100644 --- a/src/core/endpt.h +++ b/src/core/endpt.h @@ -1,5 +1,5 @@ // -// Copyright 2016 Garrett D'Amore +// Copyright 2017 Garrett D'Amore // Copyright 2017 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -11,58 +11,30 @@ #ifndef CORE_ENDPT_H #define CORE_ENDPT_H -#include "core/defs.h" -#include "core/list.h" -#include "core/thread.h" -#include "core/transport.h" - -// NB: This structure is supplied here for use by the CORE. Use of this -// OUSIDE of the core is STRICTLY VERBOTEN. NO DIRECT ACCESS BY PROTOCOLS -// OR TRANSPORTS. -struct nni_ep { - nni_tran_ep ep_ops; // transport ops - nni_tran * ep_tran; // transport pointer - void * ep_data; // transport private - uint32_t ep_id; // endpoint id - nni_list_node ep_node; // per socket list - nni_sock * ep_sock; - char ep_addr[NNG_MAXADDRLEN]; - int ep_mode; - int ep_started; - int ep_stop; - int ep_closed; // full shutdown - int ep_bound; // true if we bound locally - int ep_refcnt; - nni_mtx ep_mtx; - nni_cv ep_cv; - nni_list ep_pipes; - nni_aio ep_acc_aio; - nni_aio ep_con_aio; - nni_aio ep_con_syn; // used for sync connect - nni_aio ep_backoff; // backoff timer - nni_duration ep_maxrtime; // maximum time for reconnect - nni_duration ep_currtime; // current time for reconnect - nni_duration ep_inirtime; // initial time for reconnect - nni_time ep_conntime; // time of last good connect - nni_list_node ep_reap_node; -}; +extern int nni_ep_sys_init(void); +extern void nni_ep_sys_fini(void); +extern nni_tran *nni_ep_tran(nni_ep *); +extern nni_sock *nni_ep_sock(nni_ep *); +extern int nni_ep_find(nni_ep **, uint32_t); +extern int nni_ep_hold(nni_ep *); +extern void nni_ep_rele(nni_ep *); +extern uint32_t nni_ep_id(nni_ep *); +extern int nni_ep_create_dialer(nni_ep **, nni_sock *, const char *); +extern int nni_ep_create_listener(nni_ep **, nni_sock *, const char *); +extern void nni_ep_stop(nni_ep *); +extern int nni_ep_shutdown(nni_ep *); +extern void nni_ep_close(nni_ep *); +extern int nni_ep_dial(nni_ep *, int); +extern int nni_ep_listen(nni_ep *, int); +extern void nni_ep_list_init(nni_list *); +extern int nni_ep_pipe_add(nni_ep *ep, nni_pipe *); +extern void nni_ep_pipe_remove(nni_ep *, nni_pipe *); +// Endpoint modes. Currently used by transports. Remove this when we make +// transport dialers and listeners explicit. enum nni_ep_mode { NNI_EP_MODE_DIAL = 1, NNI_EP_MODE_LISTEN = 2, }; -extern int nni_ep_sys_init(void); -extern void nni_ep_sys_fini(void); -extern int nni_ep_find(nni_ep **, uint32_t); -extern uint32_t nni_ep_id(nni_ep *); -extern int nni_ep_create(nni_ep **, nni_sock *, const char *, int); -extern void nni_ep_stop(nni_ep *); -extern void nni_ep_close(nni_ep *); -extern int nni_ep_dial(nni_ep *, int); -extern int nni_ep_listen(nni_ep *, int); -extern void nni_ep_list_init(nni_list *); -extern int nni_ep_pipe_add(nni_ep *ep, nni_pipe *); -extern void nni_ep_pipe_remove(nni_ep *, nni_pipe *); - #endif // CORE_ENDPT_H -- cgit v1.2.3-70-g09d2