From 5fb832e06fd4ded6ccc45f943837fd374a9cea7a Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 18 Jul 2017 19:52:08 -0700 Subject: Fixes most of the raaces in posix; but at least one remains outstanding. Apparently there are circumstances when a pipedesc may get orphaned form the pollq. This triggers an assertion failure when it occurs. I am still trying to understand how this can occur. Stay tuned. --- src/core/endpt.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/core/endpt.c') diff --git a/src/core/endpt.c b/src/core/endpt.c index 8048de2b..596329ab 100644 --- a/src/core/endpt.c +++ b/src/core/endpt.c @@ -59,16 +59,22 @@ nni_ep_destroy(nni_ep *ep) if (ep == NULL) { return; } + + // Remove us form the table so we cannot be found. + if (ep->ep_id != 0) { + nni_idhash_remove(nni_eps, ep->ep_id); + } + nni_aio_fini(&ep->ep_acc_aio); nni_aio_fini(&ep->ep_con_aio); nni_aio_fini(&ep->ep_con_syn); nni_aio_fini(&ep->ep_backoff); + + nni_mtx_lock(&ep->ep_mtx); if (ep->ep_data != NULL) { ep->ep_ops.ep_fini(ep->ep_data); } - if (ep->ep_id != 0) { - nni_idhash_remove(nni_eps, ep->ep_id); - } + nni_mtx_unlock(&ep->ep_mtx); nni_cv_fini(&ep->ep_cv); nni_mtx_fini(&ep->ep_mtx); NNI_FREE_STRUCT(ep); -- cgit v1.2.3-70-g09d2