From d72f436b7d7c697b262968c48c2d7643069ab17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 17 Apr 2019 15:22:27 +0200 Subject: [PATCH] Replace atomic operations in bin/named/client.c with isc_refcount reference counting (cherry picked from commit ef49780d30d3ddc5735cfc32561b678a634fa72f) --- lib/ns/client.c | 18 +++++++----------- lib/ns/include/ns/interfacemgr.h | 5 +++-- lib/ns/interfacemgr.c | 7 +++++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/ns/client.c b/lib/ns/client.c index d8ab3ce9c6..24f4f830d9 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -428,12 +428,10 @@ tcpconn_detach(ns_client_t *client) { static void mark_tcp_active(ns_client_t *client, bool active) { if (active && !client->tcpactive) { - isc_atomic_xadd(&client->interface->ntcpactive, 1); + isc_refcount_increment0(&client->interface->ntcpactive, NULL); client->tcpactive = active; } else if (!active && client->tcpactive) { - uint32_t old = - isc_atomic_xadd(&client->interface->ntcpactive, -1); - INSIST(old > 0); + isc_refcount_decrement(&client->interface->ntcpactive, NULL); client->tcpactive = active; } } @@ -580,7 +578,7 @@ exit_check(ns_client_t *client) { if (client->mortal && TCP_CLIENT(client) && client->newstate != NS_CLIENTSTATE_FREED && (client->sctx->options & NS_SERVER_CLIENTTEST) == 0 && - isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0) + isc_refcount_current(&client->interface->ntcpaccepting) == 0) { /* Nobody else is accepting */ client->mortal = false; @@ -3306,7 +3304,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) { ns_client_t *client = event->ev_arg; isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); - uint32_t old; REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN); REQUIRE(NS_CLIENT_VALID(client)); @@ -3326,8 +3323,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { INSIST(client->naccepts == 1); client->naccepts--; - old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1); - INSIST(old > 0); + isc_refcount_decrement(&client->interface->ntcpaccepting, NULL); /* * We must take ownership of the new socket before the exit @@ -3457,8 +3453,8 @@ client_accept(ns_client_t *client) { * quota is tcp-clients plus the number of listening * interfaces plus 1.) */ - exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) > - (client->tcpactive ? 1 : 0)); + exit = (isc_refcount_current(&client->interface->ntcpactive) > + (client->tcpactive ? 1U : 0U)); if (exit) { client->newstate = NS_CLIENTSTATE_INACTIVE; (void)exit_check(client); @@ -3516,7 +3512,7 @@ client_accept(ns_client_t *client) { * listening for connections itself to prevent the interface * going dead. */ - isc_atomic_xadd(&client->interface->ntcpaccepting, 1); + isc_refcount_increment0(&client->interface->ntcpaccepting, NULL); } static void diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h index 24552ed353..6bbb0e67f3 100644 --- a/lib/ns/include/ns/interfacemgr.h +++ b/lib/ns/include/ns/interfacemgr.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -76,11 +77,11 @@ struct ns_interface { /*%< UDP dispatchers. */ isc_socket_t * tcpsocket; /*%< TCP socket. */ isc_dscp_t dscp; /*%< "listen-on" DSCP value */ - int32_t ntcpaccepting; /*%< Number of clients + isc_refcount_t ntcpaccepting; /*%< Number of clients ready to accept new TCP connections on this interface */ - int32_t ntcpactive; /*%< Number of clients + isc_refcount_t ntcpactive; /*%< Number of clients servicing TCP queries (whether accepting or connected) */ diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index 5f9cd8c0b9..e4e9b5e10d 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -429,8 +429,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, * connections will be handled in parallel even though there is * only one client initially. */ - ifp->ntcpaccepting = 0; - ifp->ntcpactive = 0; + isc_refcount_init(&ifp->ntcpaccepting, 0); + isc_refcount_init(&ifp->ntcpactive, 0); ifp->nudpdispatch = 0; @@ -663,6 +663,9 @@ ns_interface_destroy(ns_interface_t *ifp) { ns_interfacemgr_detach(&ifp->mgr); + isc_refcount_destroy(&ifp->ntcpactive); + isc_refcount_destroy(&ifp->ntcpaccepting); + ifp->magic = 0; isc_mem_put(mctx, ifp, sizeof(*ifp)); } -- 2.18.1