CLEANUP: stats: drop stats.h / stats-t.h where not needed

A number of C files include stats.h or stats-t.h, many of which were
just to access the counters. Now those which really need counters rely
on counters.h or counters-t.h, which already reduces the amount of
preprocessed code to be built (~3000 lines or about 0.05%).

diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index 2a99bfbbfa850ef070703679af656bd1bbee9cda..344b085d99fbfa546380f13e8ea6b63e410e6e59 100644 (file)
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -24,12 +24,12 @@
 
 #include <import/ebtree-t.h>
 
-#include <haproxy/connection-t.h>
 #include <haproxy/buf-t.h>
+#include <haproxy/connection-t.h>
+#include <haproxy/counters-t.h>
 #include <haproxy/dgram-t.h>
 #include <haproxy/dns_ring-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread.h>
 

diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index 50deb5476162fc2fac31000799a5fda70c7b47a9..cc08a224351a3efa3910aef4a40af78b4a6b1155 100644 (file)
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -28,13 +28,13 @@
 #include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
+#include <haproxy/counters-t.h>
 #include <haproxy/guid-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/quic_cc-t.h>
 #include <haproxy/quic_sock-t.h>
 #include <haproxy/quic_tp-t.h>
 #include <haproxy/receiver-t.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/thread.h>
 
 /* Some pointer types reference below */

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index 21c9aae4f47366bfc0463e72aedb5fcad647aed9..c71bde5264e16b42eafee90263d730dcadd5df26 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -38,7 +38,6 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/queue-t.h>
 #include <haproxy/server-t.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/tcpcheck-t.h>
 #include <haproxy/thread-t.h>
 #include <haproxy/tools-t.h>

diff --git a/include/haproxy/resolvers-t.h b/include/haproxy/resolvers-t.h
index fee7dd8d9ce5c3cd4d9ee8b2da1c088df8f12b5c..ace35c510a82443cf5c6fff7865582940337c60e 100644 (file)
--- a/include/haproxy/resolvers-t.h
+++ b/include/haproxy/resolvers-t.h
@@ -27,7 +27,6 @@
 #include <haproxy/connection-t.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread.h>
 

diff --git a/include/haproxy/ssl_sock.h b/include/haproxy/ssl_sock.h
index 83b6de30067dcf53675eddd05284ec16dc37a494..e8edad0e9f1b42460b8d1a20fcb7fc7a3c0763b5 100644 (file)
--- a/include/haproxy/ssl_sock.h
+++ b/include/haproxy/ssl_sock.h
@@ -25,12 +25,13 @@
 
 
 #include <haproxy/connection.h>
+#include <haproxy/counters.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/quic_conn-t.h>
 #include <haproxy/ssl_sock-t.h>
-#include <haproxy/stats.h>
+#include <haproxy/stats-t.h>
 #include <haproxy/thread.h>
 
 extern struct list tlskeys_reference;

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index a9e7c983e261e6710ac47ae1a7f3740bdcbb0193..dbf923187d9e4eaa86ee6c14d37e2230dc036ea9 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -31,7 +31,6 @@
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/tcpcheck.h>
 #include <haproxy/tools.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 7ce43858ebf52782f8a166f66d26d51102f0deb8..8b99047830dbd9b4953d14d7e1346c61e95dc974 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -88,7 +88,6 @@
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>

diff --git a/src/check.c b/src/check.c
index 574700b2b366905146875d267344c42f42e922f4..afcd27b3ef7e6e3e65ae5b9c5a18c16f0fabd21f 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -34,7 +34,7 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
-#include <haproxy/counters.h>
+#include <haproxy/counters-t.h>
 #include <haproxy/dgram.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/extcheck.h>
@@ -58,7 +58,6 @@
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
 #include <haproxy/thread.h>

diff --git a/src/cli.c b/src/cli.c
index 1d187da672a06a0c66abddd38cfde7af3ba02678..ab5a008f37f0db71d7513b58aade2e98a6aa6ebc 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -56,7 +56,6 @@
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/sock.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/systemd.h>

diff --git a/src/h3.c b/src/h3.c
index bc479ce406489c9ca669e612c7e85afa5abc9e17..2dafb5589e26bec339522c2467b3282b70ef4c37 100644 (file)
--- a/src/h3.c
+++ b/src/h3.c
@@ -41,7 +41,6 @@
 #include <haproxy/quic_fctl.h>
 #include <haproxy/quic_frame.h>
 #include <haproxy/quic_utils.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace.h>
 

diff --git a/src/haproxy.c b/src/haproxy.c
index 177df7bcbadbccbad4eef3c47c350cf340ab875b..49640f6ebb74bb010fb20ab1a533205d2e5db9ff 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -117,7 +117,6 @@
 #include <haproxy/sock_inet.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-file.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/systemd.h>
 #include <haproxy/task.h>

diff --git a/src/hlua.c b/src/hlua.c
index 34b93b0364d3b8596b14903b212f59a47c9270ff..52884221a98147ca0d326f96a67413fef7b64b07 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -57,7 +57,6 @@
 #include <haproxy/session.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>

diff --git a/src/map.c b/src/map.c
index df972b48ee4eaec6c44000a89e3390f994400f43..66875a079857cdbfb10d06d20c075dda6ebd6b7e 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -22,7 +22,6 @@
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 

diff --git a/src/peers.c b/src/peers.c
index 1d5b0bfd1837fc9fa7a45ec970bd9bbe9bebf99c..93e64aaa226935f8cb552f760300b3e3e670be6a 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -39,7 +39,6 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>

diff --git a/src/pool.c b/src/pool.c
index c52da365eccc43dff87392d13a4a3a1b1982a2fe..391c755b7cbf9829f391b4b142ce5a5a1b66bf6a 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -27,7 +27,6 @@
 #include <haproxy/pool.h>
 #include <haproxy/pool-os.h>
 #include <haproxy/sc_strm.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>

diff --git a/src/quic_sock.c b/src/quic_sock.c
index 3ed16cd802dd9f042f12b240b5ac293dd0d1dcbe..38210b2a851b82a4588cf8db27cf396b4b8580be 100644 (file)
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -23,6 +23,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
+#include <haproxy/counters.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/fd.h>
 #include <haproxy/global-t.h>
@@ -42,7 +43,6 @@
 #include <haproxy/quic_tp-t.h>
 #include <haproxy/quic_trace.h>
 #include <haproxy/session.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/task.h>
 #include <haproxy/trace.h>
 #include <haproxy/tools.h>

diff --git a/src/quic_ssl.c b/src/quic_ssl.c
index 915ec9838c136c4c01b818d707e99084c1605c1c..ad3c3c509717dcc7fcbcffa20efc16cccb6ffa6b 100644 (file)
--- a/src/quic_ssl.c
+++ b/src/quic_ssl.c
@@ -1,3 +1,4 @@
+#include <haproxy/counters.h>
 #include <haproxy/errors.h>
 #include <haproxy/ncbmbuf.h>
 #include <haproxy/proxy.h>
@@ -9,7 +10,6 @@
 #include <haproxy/quic_tp.h>
 #include <haproxy/quic_trace.h>
 #include <haproxy/ssl_sock.h>
-#include <haproxy/stats.h>
 #include <haproxy/trace.h>
 #ifdef USE_ECH
 #include <haproxy/ech.h>

diff --git a/src/resolvers.c b/src/resolvers.c
index 1ce1774c1e4e8917ed2beb0f7e8bf95837536bbd..0c1cda0537e92f9a5846ec662a145502a73da3ab 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -27,6 +27,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
+#include <haproxy/counters.h>
 #include <haproxy/dns.h>
 #include <haproxy/dns_ring.h>
 #include <haproxy/errors.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 5f60ef8e39c153a48ebb7f710f4e7a2e8a638f64..ff3b552da3c2b55c349b7d73bd149842a67ce1bd 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -36,7 +36,6 @@
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>

diff --git a/src/stream.c b/src/stream.c
index b2eef9187f5dc63ecd61dda391582c0db3974e40..40c58e32594171aeb342ae4aacda5504887cdb87 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -50,7 +50,6 @@
 #include <haproxy/resolvers.h>
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>

diff --git a/src/uri_auth.c b/src/uri_auth.c
index eddb1a0a507fecbd856a6a08d9d3ddf805f294bf..15bdb0c63bd19b2a91351b15e2fb5a9433e604b5 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -20,7 +20,6 @@
 #include <haproxy/base64.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
-#include <haproxy/stats-t.h>
 #include <haproxy/uri_auth.h>