From 5223a142e38a320ce53097cea450d8ba7f175193 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 7 Dec 2024 21:13:29 -0800 Subject: socket transport: No need for a cool down for this transport. If an error occurs, the application gets to know about it. There cannot be external factors that cause us to spin for memory, since this is not accessible via the network. --- src/sp/transport/socket/sockfd.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c index 45927d19..6fbda8fe 100644 --- a/src/sp/transport/socket/sockfd.c +++ b/src/sp/transport/socket/sockfd.c @@ -61,7 +61,6 @@ struct sfd_tran_ep { int refcnt; // active pipes nni_aio *useraio; nni_aio connaio; - nni_aio timeaio; nni_list busypipes; // busy pipes -- ones passed to socket nni_list waitpipes; // pipes waiting to match to socket nni_list negopipes; // pipes busy negotiating @@ -666,10 +665,8 @@ sfd_tran_ep_fini(void *arg) return; } nni_mtx_unlock(&ep->mtx); - nni_aio_stop(&ep->timeaio); nni_aio_stop(&ep->connaio); nng_stream_listener_free(ep->listener); - nni_aio_fini(&ep->timeaio); nni_aio_fini(&ep->connaio); nni_mtx_fini(&ep->mtx); @@ -685,7 +682,6 @@ sfd_tran_ep_close(void *arg) nni_mtx_lock(&ep->mtx); ep->closed = true; - nni_aio_close(&ep->timeaio); if (ep->listener != NULL) { nng_stream_listener_close(ep->listener); } @@ -706,15 +702,6 @@ sfd_tran_ep_close(void *arg) nni_mtx_unlock(&ep->mtx); } -static void -sfd_tran_timer_cb(void *arg) -{ - sfd_tran_ep *ep = arg; - if (nni_aio_result(&ep->timeaio) == 0) { - nng_stream_listener_accept(ep->listener, &ep->connaio); - } -} - static void sfd_tran_accept_cb(void *arg) { @@ -754,18 +741,8 @@ error: ep->useraio = NULL; nni_aio_finish_error(aio, rv); } - switch (rv) { - - case NNG_ENOMEM: - case NNG_ENOFILES: - nng_sleep_aio(10, &ep->timeaio); - break; - - default: - if (!ep->closed) { - nng_stream_listener_accept(ep->listener, &ep->connaio); - } - break; + if (!ep->closed) { + nng_stream_listener_accept(ep->listener, &ep->connaio); } nni_mtx_unlock(&ep->mtx); } @@ -820,7 +797,6 @@ sfd_tran_listener_init(void **lp, nng_url *url, nni_listener *nlistener) } nni_aio_init(&ep->connaio, sfd_tran_accept_cb, ep); - nni_aio_init(&ep->timeaio, sfd_tran_timer_cb, ep); if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != 0) { sfd_tran_ep_fini(ep); -- cgit v1.2.3-70-g09d2