Remove Raw and FDWatch type of socket statistics

The isc_sockstatscounter_raw* and isc_sockstatscounter_fdwatch was just
a dead code and those counters were not used anywhere.  Remove them.

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 24728df93023419efa36ab8a0af8e6530672fe2d..7edb92e2e6ea110edef475d6967c52a379d4e334 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -553,7 +553,6 @@ init_desc(void) {
        SET_SOCKSTATDESC(udp6open, "UDP/IPv6 sockets opened", "UDP6Open");
        SET_SOCKSTATDESC(tcp4open, "TCP/IPv4 sockets opened", "TCP4Open");
        SET_SOCKSTATDESC(tcp6open, "TCP/IPv6 sockets opened", "TCP6Open");
-       SET_SOCKSTATDESC(rawopen, "Raw sockets opened", "RawOpen");
        SET_SOCKSTATDESC(udp4openfail, "UDP/IPv4 socket open failures",
                         "UDP4OpenFail");
        SET_SOCKSTATDESC(udp6openfail, "UDP/IPv6 socket open failures",
@@ -562,15 +561,10 @@ init_desc(void) {
                         "TCP4OpenFail");
        SET_SOCKSTATDESC(tcp6openfail, "TCP/IPv6 socket open failures",
                         "TCP6OpenFail");
-       SET_SOCKSTATDESC(rawopenfail, "Raw socket open failures",
-                        "RawOpenFail");
        SET_SOCKSTATDESC(udp4close, "UDP/IPv4 sockets closed", "UDP4Close");
        SET_SOCKSTATDESC(udp6close, "UDP/IPv6 sockets closed", "UDP6Close");
        SET_SOCKSTATDESC(tcp4close, "TCP/IPv4 sockets closed", "TCP4Close");
        SET_SOCKSTATDESC(tcp6close, "TCP/IPv6 sockets closed", "TCP6Close");
-       SET_SOCKSTATDESC(fdwatchclose, "FDwatch sockets closed",
-                        "FDWatchClose");
-       SET_SOCKSTATDESC(rawclose, "Raw sockets closed", "RawClose");
        SET_SOCKSTATDESC(udp4bindfail, "UDP/IPv4 socket bind failures",
                         "UDP4BindFail");
        SET_SOCKSTATDESC(udp6bindfail, "UDP/IPv6 socket bind failures",
@@ -579,8 +573,6 @@ init_desc(void) {
                         "TCP4BindFail");
        SET_SOCKSTATDESC(tcp6bindfail, "TCP/IPv6 socket bind failures",
                         "TCP6BindFail");
-       SET_SOCKSTATDESC(fdwatchbindfail, "FDwatch socket bind failures",
-                        "FdwatchBindFail");
        SET_SOCKSTATDESC(udp4connectfail, "UDP/IPv4 socket connect failures",
                         "UDP4ConnFail");
        SET_SOCKSTATDESC(udp6connectfail, "UDP/IPv6 socket connect failures",
@@ -589,8 +581,6 @@ init_desc(void) {
                         "TCP4ConnFail");
        SET_SOCKSTATDESC(tcp6connectfail, "TCP/IPv6 socket connect failures",
                         "TCP6ConnFail");
-       SET_SOCKSTATDESC(fdwatchconnectfail, "FDwatch socket connect failures",
-                        "FDwatchConnFail");
        SET_SOCKSTATDESC(udp4connect, "UDP/IPv4 connections established",
                         "UDP4Conn");
        SET_SOCKSTATDESC(udp6connect, "UDP/IPv6 connections established",
@@ -599,9 +589,6 @@ init_desc(void) {
                         "TCP4Conn");
        SET_SOCKSTATDESC(tcp6connect, "TCP/IPv6 connections established",
                         "TCP6Conn");
-       SET_SOCKSTATDESC(fdwatchconnect,
-                        "FDwatch domain connections established",
-                        "FDwatchConn");
        SET_SOCKSTATDESC(tcp4acceptfail, "TCP/IPv4 connection accept failures",
                         "TCP4AcceptFail");
        SET_SOCKSTATDESC(tcp6acceptfail, "TCP/IPv6 connection accept failures",
@@ -614,20 +601,14 @@ init_desc(void) {
        SET_SOCKSTATDESC(udp6sendfail, "UDP/IPv6 send errors", "UDP6SendErr");
        SET_SOCKSTATDESC(tcp4sendfail, "TCP/IPv4 send errors", "TCP4SendErr");
        SET_SOCKSTATDESC(tcp6sendfail, "TCP/IPv6 send errors", "TCP6SendErr");
-       SET_SOCKSTATDESC(fdwatchsendfail, "FDwatch send errors",
-                        "FDwatchSendErr");
        SET_SOCKSTATDESC(udp4recvfail, "UDP/IPv4 recv errors", "UDP4RecvErr");
        SET_SOCKSTATDESC(udp6recvfail, "UDP/IPv6 recv errors", "UDP6RecvErr");
        SET_SOCKSTATDESC(tcp4recvfail, "TCP/IPv4 recv errors", "TCP4RecvErr");
        SET_SOCKSTATDESC(tcp6recvfail, "TCP/IPv6 recv errors", "TCP6RecvErr");
-       SET_SOCKSTATDESC(fdwatchrecvfail, "FDwatch recv errors",
-                        "FDwatchRecvErr");
-       SET_SOCKSTATDESC(rawrecvfail, "Raw recv errors", "RawRecvErr");
        SET_SOCKSTATDESC(udp4active, "UDP/IPv4 sockets active", "UDP4Active");
        SET_SOCKSTATDESC(udp6active, "UDP/IPv6 sockets active", "UDP6Active");
        SET_SOCKSTATDESC(tcp4active, "TCP/IPv4 sockets active", "TCP4Active");
        SET_SOCKSTATDESC(tcp6active, "TCP/IPv6 sockets active", "TCP6Active");
-       SET_SOCKSTATDESC(rawactive, "Raw sockets active", "RawActive");
        INSIST(i == isc_sockstatscounter_max);
 
        /* Initialize DNSSEC statistics */

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index a9b66d055b704c9803849067a632aefa5099a3d9..c26dbb6ddebcecba032feac8877caa8e78e7af76 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -7932,17 +7932,16 @@ Socket I/O Statistics Counters
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Socket I/O statistics counters are defined per socket type, which are
-``UDP4`` (UDP/IPv4), ``UDP6`` (UDP/IPv6), ``TCP4`` (TCP/IPv4), ``TCP6``
-(TCP/IPv6), and ``FDwatch`` (sockets opened
-outside the socket module). In the following list, ``<TYPE>`` represents
+``UDP4`` (UDP/IPv4), ``UDP6`` (UDP/IPv6), ``TCP4`` (TCP/IPv4), and ``TCP6``
+(TCP/IPv6). In the following list, ``<TYPE>`` represents
 a socket type. Not all counters are available for all socket types;
 exceptions are noted in the descriptions.
 
 ``<TYPE>Open``
-    This indicates the number of sockets opened successfully. This counter does not apply to the ``FDwatch`` type.
+    This indicates the number of sockets opened successfully.
 
 ``<TYPE>OpenFail``
-    This indicates the number of failures to open sockets. This counter does not apply to the ``FDwatch`` type.
+    This indicates the number of failures to open sockets.
 
 ``<TYPE>Close``
     This indicates the number of closed sockets.
@@ -7957,10 +7956,10 @@ exceptions are noted in the descriptions.
     This indicates the number of connections established successfully.
 
 ``<TYPE>AcceptFail``
-    This indicates the number of failures to accept incoming connection requests. This counter does not apply to the ``UDP`` and ``FDwatch`` types.
+    This indicates the number of failures to accept incoming connection requests. This counter does not apply to the ``UDP`` type.
 
 ``<TYPE>Accept``
-    This indicates the number of incoming connections successfully accepted. This counter does not apply to the ``UDP`` and ``FDwatch`` types.
+    This indicates the number of incoming connections successfully accepted. This counter does not apply to the ``UDP`` type.
 
 ``<TYPE>SendErr``
     This indicates the number of errors in socket send operations.

diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h
index 4500afc83c09e78fc1348588087dc1b12a714637..3cc60b0644655ccb9257e267f1998d9aaee8a9af 100644 (file)
--- a/lib/isc/include/isc/stats.h
+++ b/lib/isc/include/isc/stats.h
@@ -40,25 +40,21 @@ enum {
        isc_sockstatscounter_udp6close,
        isc_sockstatscounter_tcp4close,
        isc_sockstatscounter_tcp6close,
-       isc_sockstatscounter_fdwatchclose,
 
        isc_sockstatscounter_udp4bindfail,
        isc_sockstatscounter_udp6bindfail,
        isc_sockstatscounter_tcp4bindfail,
        isc_sockstatscounter_tcp6bindfail,
-       isc_sockstatscounter_fdwatchbindfail,
 
        isc_sockstatscounter_udp4connect,
        isc_sockstatscounter_udp6connect,
        isc_sockstatscounter_tcp4connect,
        isc_sockstatscounter_tcp6connect,
-       isc_sockstatscounter_fdwatchconnect,
 
        isc_sockstatscounter_udp4connectfail,
        isc_sockstatscounter_udp6connectfail,
        isc_sockstatscounter_tcp4connectfail,
        isc_sockstatscounter_tcp6connectfail,
-       isc_sockstatscounter_fdwatchconnectfail,
 
        isc_sockstatscounter_tcp4accept,
        isc_sockstatscounter_tcp6accept,
@@ -70,13 +66,11 @@ enum {
        isc_sockstatscounter_udp6sendfail,
        isc_sockstatscounter_tcp4sendfail,
        isc_sockstatscounter_tcp6sendfail,
-       isc_sockstatscounter_fdwatchsendfail,
 
        isc_sockstatscounter_udp4recvfail,
        isc_sockstatscounter_udp6recvfail,
        isc_sockstatscounter_tcp4recvfail,
        isc_sockstatscounter_tcp6recvfail,
-       isc_sockstatscounter_fdwatchrecvfail,
 
        isc_sockstatscounter_udp4active,
        isc_sockstatscounter_udp6active,