From: Willy Tarreau <w@1wt.eu>
Date: Tue, 24 Feb 2026 18:31:51 +0000 (+0100)
Subject: CLEANUP: stats: drop stats.h / stats-t.h where not needed
X-Git-Tag: v3.4-dev6~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56fc12d6fab5957088a3814d1a21d3f4dd8280cc;p=thirdparty%2Fhaproxy.git

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 2a99bfbbf..344b085d9 100644
--- 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 50deb5476..cc08a2243 100644
--- 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 21c9aae4f..c71bde526 100644
--- 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 fee7dd8d9..ace35c510 100644
--- 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 83b6de300..e8edad0e9 100644
--- 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 a9e7c983e..dbf923187 100644
--- 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 7ce43858e..8b9904783 100644
--- 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 574700b2b..afcd27b3e 100644
--- 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 1d187da67..ab5a008f3 100644
--- 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 bc479ce40..2dafb5589 100644
--- 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 177df7bcb..49640f6eb 100644
--- 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 34b93b036..52884221a 100644
--- 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 df972b48e..66875a079 100644
--- 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 1d5b0bfd1..93e64aaa2 100644
--- 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 c52da365e..391c755b7 100644
--- 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 3ed16cd80..38210b2a8 100644
--- 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 915ec9838..ad3c3c509 100644
--- 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 1ce1774c1..0c1cda053 100644
--- 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 5f60ef8e3..ff3b552da 100644
--- 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 b2eef9187..40c58e325 100644
--- 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 eddb1a0a5..15bdb0c63 100644
--- 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>