From d753c00d43e6dc642b2445e4821537a92b8b8d23 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 22 Jun 2017 17:51:37 -0700 Subject: Start undoing the recursive references -- KISS. --- src/core/endpt.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/core/endpt.c') diff --git a/src/core/endpt.c b/src/core/endpt.c index d3b004d5..efd3eefb 100644 --- a/src/core/endpt.c +++ b/src/core/endpt.c @@ -198,17 +198,16 @@ nni_ep_close(nni_ep *ep) nni_sock *sock = ep->ep_sock; nni_mtx_lock(&ep->ep_mtx); - NNI_ASSERT(ep->ep_closed == 0); - ep->ep_closed = 1; - ep->ep_ops.ep_close(ep->ep_data); - if ((pipe = ep->ep_pipe) != NULL) { - pipe->p_ep = NULL; - ep->ep_pipe = NULL; - } - nni_cv_wake(&ep->ep_cv); + if (ep->ep_closed == 0) { + ep->ep_closed = 1; + ep->ep_ops.ep_close(ep->ep_data); + if ((pipe = ep->ep_pipe) != NULL) { + pipe->p_ep = NULL; + ep->ep_pipe = NULL; + } + nni_cv_wake(&ep->ep_cv); + } nni_mtx_unlock(&ep->ep_mtx); - - nni_objhash_unref(nni_eps, ep->ep_id); } -- cgit v1.2.3-70-g09d2