CLEANUP: quic-stats: include counters from quic_stats

There's something a bit awkward in the way stats counters are inherited
through the QUIC modules: quic_conn-t includes quic_stats-t.h, which
declares quic_stats_module as extern from a type that's not known from
this file. And anyway externs should not be exported from type defintions
since they're not part of the ABI itself.

This commit moves the declaration to quic_stats.h which now takes care
to include stats-t.h to get the definition of struct stats_module. The
few users who used to learn it through quic_conn-t.h now include it
explicitly. As a bonus this reduces the number of preprocessed lines
by 5000 (~0.1%).

By the way, it looks like struct stats_module could benefit from being
moved off stats-t.h since it's only used at places where the rest of
the stats is not needed. Maybe something to consider for a future
cleanup.

diff --git a/include/haproxy/quic_conn-t.h b/include/haproxy/quic_conn-t.h
index a0f4d98fceebae19007eca70dae4f5374e8ad00b..ca23260cdf40ddf0ae9a4b9e6798a6e02b53274c 100644 (file)
--- a/include/haproxy/quic_conn-t.h
+++ b/include/haproxy/quic_conn-t.h
@@ -38,7 +38,6 @@
 #include <haproxy/quic_cc-t.h>
 #include <haproxy/quic_frame-t.h>
 #include <haproxy/quic_openssl_compat-t.h>
-#include <haproxy/quic_stats-t.h>
 #include <haproxy/quic_tls-t.h>
 #include <haproxy/quic_tp-t.h>
 #include <haproxy/show_flags-t.h>

diff --git a/include/haproxy/quic_stats-t.h b/include/haproxy/quic_stats-t.h
index 0a82d7cacbb3c9d536a4c29c1342c224b04ec899..76f3ab2436cdc7e9e68914201c160e684c094d55 100644 (file)
--- a/include/haproxy/quic_stats-t.h
+++ b/include/haproxy/quic_stats-t.h
@@ -6,8 +6,6 @@
 #error "Must define USE_OPENSSL"
 #endif
 
-extern struct stats_module quic_stats_module;
-
 enum {
        QUIC_ST_RXBUF_FULL,
        QUIC_ST_DROPPED_PACKET,

diff --git a/include/haproxy/quic_stats.h b/include/haproxy/quic_stats.h
index b2a8dec73ab1ac9a24487e48bfd89f864210399b..ce5d4688d945d4a56c5e37dd8c45f2c68aa8b1d5 100644 (file)
--- a/include/haproxy/quic_stats.h
+++ b/include/haproxy/quic_stats.h
@@ -7,7 +7,9 @@
 #endif
 
 #include <haproxy/quic_stats-t.h>
+#include <haproxy/stats-t.h>
 
+extern struct stats_module quic_stats_module;
 void quic_stats_transp_err_count_inc(struct quic_counters *ctrs, int error_code);
 
 #endif /* USE_QUIC */

diff --git a/src/mux_quic.c b/src/mux_quic.c
index 8da5d9a2c080c5d9c1f8938f85f0ac13a20b68ae..0f70d9b9ba5b0a05b187db5a51ff6d96f691b362 100644 (file)
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -22,6 +22,7 @@
 #include <haproxy/quic_pacing.h>
 #include <haproxy/quic_sock.h>
 #include <haproxy/quic_stream.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_tp-t.h>
 #include <haproxy/quic_tune.h>
 #include <haproxy/quic_tx.h>

diff --git a/src/quic_retry.c b/src/quic_retry.c
index e6b901f05bc167cdfda56a5a5c9fcc505d76184a..2ac981034e23a3f24455e18cbc6e09edf9879ff8 100644 (file)
--- a/src/quic_retry.c
+++ b/src/quic_retry.c
@@ -4,6 +4,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/quic_retry.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_tls.h>
 #include <haproxy/quic_trace-t.h>
 #include <haproxy/trace.h>

diff --git a/src/quic_rx.c b/src/quic_rx.c
index 70ac60695452fe195930314a2129638b532e1bbb..d967a4e65c96d27244e02c5436b76a3c4856aa27 100644 (file)
--- a/src/quic_rx.c
+++ b/src/quic_rx.c
@@ -25,6 +25,7 @@
 #include <haproxy/quic_retry.h>
 #include <haproxy/quic_rules.h>
 #include <haproxy/quic_sock.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_stream.h>
 #include <haproxy/quic_ssl.h>
 #include <haproxy/quic_tls.h>

diff --git a/src/quic_sock.c b/src/quic_sock.c
index f0322e5070dd5c2ab0fe84aa567e26d0b25a971a..3ed16cd802dd9f042f12b240b5ac293dd0d1dcbe 100644 (file)
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -38,6 +38,7 @@
 #include <haproxy/quic_conn.h>
 #include <haproxy/quic_rx.h>
 #include <haproxy/quic_sock.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_tp-t.h>
 #include <haproxy/quic_trace.h>
 #include <haproxy/session.h>

diff --git a/src/quic_ssl.c b/src/quic_ssl.c
index 00e2c1e320bb463994bb628393a6d2b1b643b94a..915ec9838c136c4c01b818d707e99084c1605c1c 100644 (file)
--- a/src/quic_ssl.c
+++ b/src/quic_ssl.c
@@ -4,6 +4,7 @@
 #include <haproxy/quic_conn.h>
 #include <haproxy/quic_sock.h>
 #include <haproxy/quic_ssl.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_tls.h>
 #include <haproxy/quic_tp.h>
 #include <haproxy/quic_trace.h>

diff --git a/src/quic_tx.c b/src/quic_tx.c
index 53f502643b4e41a6f1713e55f99d0775bde2f44b..c9a7c20946ff9a8c78814856925d9951b15eb11e 100644 (file)
--- a/src/quic_tx.c
+++ b/src/quic_tx.c
@@ -25,6 +25,7 @@
 #include <haproxy/quic_retransmit.h>
 #include <haproxy/quic_retry.h>
 #include <haproxy/quic_sock.h>
+#include <haproxy/quic_stats.h>
 #include <haproxy/quic_stream.h>
 #include <haproxy/quic_tls.h>
 #include <haproxy/quic_trace.h>