Rename sock->timer to sock->read_timer

Before adding the write timer, we have to remove the generic sock->timer
to sock->read_timer.  We don't touch the function names to limit the
impact of the refactoring.

(cherry picked from commit 45a73c113f2982b7171632d75d4bbb51d4e6bb53)

diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
index 6c87b0f1cf6bb9ace56f00eccf688bda6f02a08c..c4b8ca54762b65c5816dbef43a93c5c26087582f 100644 (file)
--- a/lib/isc/netmgr/netmgr-int.h
+++ b/lib/isc/netmgr/netmgr-int.h
@@ -763,7 +763,7 @@ struct isc_nmsocket {
        /*%
         * TCP read/connect timeout timers.
         */
-       uv_timer_t timer;
+       uv_timer_t read_timer;
        uint64_t read_timeout;
        uint64_t connect_timeout;
 

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 4b9e2a5ecc3a9d8acad192139392d1de7ec2697b..b2883892449b6990f87e754846ece3fa48c255c1 100644 (file)
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -1882,7 +1882,7 @@ isc__nm_failed_connect_cb(isc_nmsocket_t *sock, isc__nm_uvreq_t *req,
        REQUIRE(req->cb.connect != NULL);
 
        isc__nmsocket_timer_stop(sock);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        INSIST(atomic_compare_exchange_strong(&sock->connecting,
                                              &(bool){ true }, false));
@@ -2005,7 +2005,7 @@ isc__nmsocket_timer_restart(isc_nmsocket_t *sock) {
                        return;
                }
 
-               r = uv_timer_start(&sock->timer,
+               r = uv_timer_start(&sock->read_timer,
                                   isc__nmsocket_connecttimeout_cb,
                                   sock->connect_timeout + 10, 0);
                UV_RUNTIME_CHECK(uv_timer_start, r);
@@ -2017,7 +2017,8 @@ isc__nmsocket_timer_restart(isc_nmsocket_t *sock) {
                        return;
                }
 
-               r = uv_timer_start(&sock->timer, isc__nmsocket_readtimeout_cb,
+               r = uv_timer_start(&sock->read_timer,
+                                  isc__nmsocket_readtimeout_cb,
                                   sock->read_timeout, 0);
                UV_RUNTIME_CHECK(uv_timer_start, r);
        }
@@ -2027,7 +2028,7 @@ bool
 isc__nmsocket_timer_running(isc_nmsocket_t *sock) {
        REQUIRE(VALID_NMSOCK(sock));
 
-       return (uv_is_active((uv_handle_t *)&sock->timer));
+       return (uv_is_active((uv_handle_t *)&sock->read_timer));
 }
 
 void
@@ -2049,7 +2050,7 @@ isc__nmsocket_timer_stop(isc_nmsocket_t *sock) {
 
        /* uv_timer_stop() is idempotent, no need to check if running */
 
-       r = uv_timer_stop(&sock->timer);
+       r = uv_timer_stop(&sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_stop, r);
 }
 
@@ -2283,7 +2284,7 @@ isc_nmhandle_cleartimeout(isc_nmhandle_t *handle) {
        default:
                handle->sock->read_timeout = 0;
 
-               if (uv_is_active((uv_handle_t *)&handle->sock->timer)) {
+               if (uv_is_active((uv_handle_t *)&handle->sock->read_timer)) {
                        isc__nmsocket_timer_stop(handle->sock);
                }
        }

diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c
index 195a83d92efc321010b23996e0547f0fb333b18d..52cc32f03976c1f942eabee231faf2dfcfbe6b5c 100644 (file)
--- a/lib/isc/netmgr/tcp.c
+++ b/lib/isc/netmgr/tcp.c
@@ -140,8 +140,9 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
        UV_RUNTIME_CHECK(uv_tcp_init, r);
        uv_handle_set_data(&sock->uv_handle.handle, sock);
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        r = uv_tcp_open(&sock->uv_handle.tcp, sock->fd);
        if (r != 0) {
@@ -170,7 +171,8 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
        }
        isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]);
 
-       uv_handle_set_data((uv_handle_t *)&sock->timer, &req->uv_req.connect);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer,
+                          &req->uv_req.connect);
        isc__nmsocket_timer_start(sock);
 
        atomic_store(&sock->connected, true);
@@ -231,7 +233,7 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) {
        REQUIRE(sock->tid == isc_nm_tid());
 
        isc__nmsocket_timer_stop(sock);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        if (!atomic_load(&sock->connecting)) {
                return;
@@ -526,10 +528,9 @@ isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
        /* This keeps the socket alive after everything else is gone */
        isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        LOCK(&sock->parent->lock);
 
@@ -976,9 +977,9 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
        UV_RUNTIME_CHECK(uv_tcp_init, r);
        uv_handle_set_data(&csock->uv_handle.handle, csock);
 
-       r = uv_timer_init(&worker->loop, &csock->timer);
+       r = uv_timer_init(&worker->loop, &csock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-       uv_handle_set_data((uv_handle_t *)&csock->timer, csock);
+       uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
 
        r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
        if (r != 0) {
@@ -1280,8 +1281,8 @@ tcp_close_direct(isc_nmsocket_t *sock) {
        isc__nmsocket_timer_stop(sock);
        isc__nm_stop_reading(sock);
 
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
-       uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+       uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
 }
 
 void
@@ -1399,7 +1400,7 @@ isc__nm_async_tcpcancel(isc__networker_t *worker, isc__netievent_t *ev0) {
        REQUIRE(sock->tid == isc_nm_tid());
        UNUSED(worker);
 
-       uv_timer_stop(&sock->timer);
+       uv_timer_stop(&sock->read_timer);
 
        isc__nm_tcp_failed_read_cb(sock, ISC_R_EOF);
 }

diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c
index a00a513114e6e838820212a6e35eb53948090e3a..8f4ecfb9aca6291755e61f897c3a865c2c7e2bb0 100644 (file)
--- a/lib/isc/netmgr/tcpdns.c
+++ b/lib/isc/netmgr/tcpdns.c
@@ -105,8 +105,9 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
        UV_RUNTIME_CHECK(uv_tcp_init, r);
        uv_handle_set_data(&sock->uv_handle.handle, sock);
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        if (isc__nm_closing(sock)) {
                result = ISC_R_CANCELED;
@@ -144,7 +145,8 @@ tcpdns_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
        }
        isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]);
 
-       uv_handle_set_data((uv_handle_t *)&sock->timer, &req->uv_req.connect);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer,
+                          &req->uv_req.connect);
        isc__nmsocket_timer_start(sock);
 
        atomic_store(&sock->connected, true);
@@ -205,7 +207,7 @@ tcpdns_connect_cb(uv_connect_t *uvreq, int status) {
        REQUIRE(sock->tid == isc_nm_tid());
 
        isc__nmsocket_timer_stop(sock);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        if (!atomic_load(&sock->connecting)) {
                return;
@@ -496,9 +498,9 @@ isc__nm_async_tcpdnslisten(isc__networker_t *worker, isc__netievent_t *ev0) {
        /* This keeps the socket alive after everything else is gone */
        isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        LOCK(&sock->parent->lock);
 
@@ -950,9 +952,9 @@ accept_connection(isc_nmsocket_t *ssock, isc_quota_t *quota) {
        UV_RUNTIME_CHECK(uv_tcp_init, r);
        uv_handle_set_data(&csock->uv_handle.handle, csock);
 
-       r = uv_timer_init(&worker->loop, &csock->timer);
+       r = uv_timer_init(&worker->loop, &csock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-       uv_handle_set_data((uv_handle_t *)&csock->timer, csock);
+       uv_handle_set_data((uv_handle_t *)&csock->read_timer, csock);
 
        r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
        if (r != 0) {
@@ -1302,8 +1304,8 @@ tcpdns_close_direct(isc_nmsocket_t *sock) {
        isc__nmsocket_timer_stop(sock);
        isc__nm_stop_reading(sock);
 
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
-       uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
+       uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
 }
 
 void

diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c
index e732c95dde918f2afc21b5aba67a57027f248645..8119ac79c61ee4114405f072351d542f3ab8864c 100644 (file)
--- a/lib/isc/netmgr/udp.c
+++ b/lib/isc/netmgr/udp.c
@@ -228,9 +228,9 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) {
        /* This keeps the socket alive after everything else is gone */
        isc__nmsocket_attach(sock, &(isc_nmsocket_t *){ NULL });
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        LOCK(&sock->parent->lock);
 
@@ -650,9 +650,9 @@ udp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
        UV_RUNTIME_CHECK(uv_udp_init, r);
        uv_handle_set_data(&sock->uv_handle.handle, sock);
 
-       r = uv_timer_init(&worker->loop, &sock->timer);
+       r = uv_timer_init(&worker->loop, &sock->read_timer);
        UV_RUNTIME_CHECK(uv_timer_init, r);
-       uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
+       uv_handle_set_data((uv_handle_t *)&sock->read_timer, sock);
 
        r = uv_udp_open(&sock->uv_handle.udp, sock->fd);
        if (r != 0) {
@@ -1064,7 +1064,7 @@ udp_close_direct(isc_nmsocket_t *sock) {
        REQUIRE(VALID_NMSOCK(sock));
        REQUIRE(sock->tid == isc_nm_tid());
 
-       uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
+       uv_close((uv_handle_t *)&sock->read_timer, timer_close_cb);
 }
 
 void