From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Oct 2021 16:31:48 +0000 (+0200)
Subject: CLEANUP: tree-wide: only include ebtree-t from type files
X-Git-Tag: v2.5-dev9~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1db546eecd3982ffc1ea92c2f542a3b01ce43137;p=thirdparty%2Fhaproxy.git

CLEANUP: tree-wide: only include ebtree-t from type files

No need to include the full tree management code, type files only
need the definitions. Doing so reduces the whole code size by around
3.6% and the build time is down to just 6s.
---

diff --git a/include/haproxy/check-t.h b/include/haproxy/check-t.h
index 084b15edab..21b744dcb5 100644
--- a/include/haproxy/check-t.h
+++ b/include/haproxy/check-t.h
@@ -15,7 +15,7 @@
 #ifndef _HAPROXY_CHECKS_T_H
 #define _HAPROXY_CHECKS_T_H
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 #include <import/ist.h>
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index 0372ebfcdc..0ba8555ff3 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -28,7 +28,7 @@
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 
-#include <import/ebmbtree.h>
+#include <import/ebtree-t.h>
 #include <import/ist.h>
 
 #include <haproxy/api-t.h>
diff --git a/include/haproxy/dict-t.h b/include/haproxy/dict-t.h
index cb2ea9003c..b8124e3637 100644
--- a/include/haproxy/dict-t.h
+++ b/include/haproxy/dict-t.h
@@ -27,7 +27,7 @@
 #ifndef _HAPROXY_DICT_T_H
 #define _HAPROXY_DICT_T_H
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/thread-t.h>
 
diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index 1e68944eda..461a5d19a0 100644
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_DNS_T_H
 #define _HAPROXY_DNS_T_H
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/connection-t.h>
 #include <haproxy/buf-t.h>
diff --git a/include/haproxy/fcgi-app-t.h b/include/haproxy/fcgi-app-t.h
index 10cb1785f5..542d586e8e 100644
--- a/include/haproxy/fcgi-app-t.h
+++ b/include/haproxy/fcgi-app-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_HTTP_FCGI_T_H
 #define _HAPROXY_HTTP_FCGI_T_H
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 #include <import/ist.h>
 
 #include <haproxy/acl-t.h>
diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index fa694b5323..3d33834c76 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -27,7 +27,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
diff --git a/include/haproxy/lb_chash-t.h b/include/haproxy/lb_chash-t.h
index e96193e4ba..c4379819f4 100644
--- a/include/haproxy/lb_chash-t.h
+++ b/include/haproxy/lb_chash-t.h
@@ -22,8 +22,7 @@
 #ifndef _HAPROXY_LB_CHASH_T_H
 #define _HAPROXY_LB_CHASH_T_H
 
-#include <import/eb32tree.h>
-#include <import/ebtree.h>
+#include <import/ebtree-t.h>
 
 struct lb_chash {
 	struct eb_root act;	/* weighted chash entries of active servers */
diff --git a/include/haproxy/lb_fas-t.h b/include/haproxy/lb_fas-t.h
index e5b1aebd41..cfb274cb2f 100644
--- a/include/haproxy/lb_fas-t.h
+++ b/include/haproxy/lb_fas-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_LB_FAS_T_H
 #define _HAPROXY_LB_FAS_T_H
 
-#include <import/ebtree.h>
+#include <import/ebtree-t.h>
 
 struct lb_fas {
 	struct eb_root act;	/* weighted least conns on the active servers */
diff --git a/include/haproxy/lb_fwlc-t.h b/include/haproxy/lb_fwlc-t.h
index e5064be115..258a6ab95d 100644
--- a/include/haproxy/lb_fwlc-t.h
+++ b/include/haproxy/lb_fwlc-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_LB_FWLC_T_H
 #define _HAPROXY_LB_FWLC_T_H
 
-#include <import/ebtree.h>
+#include <import/ebtree-t.h>
 
 struct lb_fwlc {
 	struct eb_root act;	/* weighted least conns on the active servers */
diff --git a/include/haproxy/lb_fwrr-t.h b/include/haproxy/lb_fwrr-t.h
index 0e12e1ba0b..f7b746e83b 100644
--- a/include/haproxy/lb_fwrr-t.h
+++ b/include/haproxy/lb_fwrr-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_LB_FWRR_T_H
 #define _HAPROXY_LB_FWRR_T_H
 
-#include <import/ebtree.h>
+#include <import/ebtree-t.h>
 
 /* This structure is used to apply fast weighted round robin on a server group */
 struct fwrr_group {
diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index 70839eef04..66cabee9fd 100644
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/obj_type-t.h>
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index 8907249b87..4dc86d2ee9 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -32,7 +32,7 @@
 #include <haproxy/connection-t.h>
 #include <haproxy/dynbuf-t.h>
 
-#include <import/eb64tree.h>
+#include <import/ebtree-t.h>
 
 /* Bit shift to get the stream sub ID for internal use which is obtained
  * shifting the stream IDs by this value, knowing that the
diff --git a/include/haproxy/namespace-t.h b/include/haproxy/namespace-t.h
index b86ae31a5f..fe465775b8 100644
--- a/include/haproxy/namespace-t.h
+++ b/include/haproxy/namespace-t.h
@@ -23,7 +23,7 @@
 #ifndef _HAPROXY_NAMESPACE_T_H
 #define _HAPROXY_NAMESPACE_T_H
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 #include <haproxy/api-t.h>
 
 /* the struct is just empty if namespaces are not supported */
diff --git a/include/haproxy/pattern-t.h b/include/haproxy/pattern-t.h
index 27305b2d17..32802d41c0 100644
--- a/include/haproxy/pattern-t.h
+++ b/include/haproxy/pattern-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_PATTERN_T_H
 #define _HAPROXY_PATTERN_T_H
 
-#include <import/ebmbtree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/regex-t.h>
diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h
index 0c712e5a17..6d2a9688a9 100644
--- a/include/haproxy/peers-t.h
+++ b/include/haproxy/peers-t.h
@@ -27,7 +27,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/dict-t.h>
diff --git a/include/haproxy/protocol-t.h b/include/haproxy/protocol-t.h
index ce92765eaa..7ce73db874 100644
--- a/include/haproxy/protocol-t.h
+++ b/include/haproxy/protocol-t.h
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 #include <haproxy/api-t.h>
 
 /* some pointer types referenced below */
diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index 38a6ca972d..5ef47c3f43 100644
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -27,8 +27,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <import/eb32tree.h>
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/arg-t.h>
diff --git a/include/haproxy/queue-t.h b/include/haproxy/queue-t.h
index 266744909a..8f6a1ec8d5 100644
--- a/include/haproxy/queue-t.h
+++ b/include/haproxy/queue-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_QUEUE_T_H
 #define _HAPROXY_QUEUE_T_H
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 #include <haproxy/api-t.h>
 
 struct proxy;
diff --git a/include/haproxy/quic_frame-t.h b/include/haproxy/quic_frame-t.h
index 13b4cbfa09..f174073195 100644
--- a/include/haproxy/quic_frame-t.h
+++ b/include/haproxy/quic_frame-t.h
@@ -31,7 +31,7 @@
 
 #include <haproxy/list.h>
 
-#include <import/eb64tree.h>
+#include <import/ebtree-t.h>
 
 /* QUIC frame types. */
 enum quic_frame_type {
diff --git a/include/haproxy/resolvers-t.h b/include/haproxy/resolvers-t.h
index 97c0d9ee33..463e24bea9 100644
--- a/include/haproxy/resolvers-t.h
+++ b/include/haproxy/resolvers-t.h
@@ -22,7 +22,7 @@
 #ifndef _HAPROXY_RESOLVERS_T_H
 #define _HAPROXY_RESOLVERS_T_H
 
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/connection-t.h>
 #include <haproxy/dns-t.h>
diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index fbd3cb7cb8..80c98647fd 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -25,8 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <import/eb32tree.h>
-#include <import/ebmbtree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/check-t.h>
diff --git a/include/haproxy/ssl_ckch-t.h b/include/haproxy/ssl_ckch-t.h
index 2589a526e8..7f13f3d7d3 100644
--- a/include/haproxy/ssl_ckch-t.h
+++ b/include/haproxy/ssl_ckch-t.h
@@ -33,7 +33,7 @@
 #define _HAPROXY_SSL_CKCH_T_H
 #ifdef USE_OPENSSL
 
-#include <import/ebmbtree.h>
+#include <import/ebtree-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/openssl-compat.h>
 
diff --git a/include/haproxy/ssl_crtlist-t.h b/include/haproxy/ssl_crtlist-t.h
index 7ec8aa9f0b..dc7a3764a8 100644
--- a/include/haproxy/ssl_crtlist-t.h
+++ b/include/haproxy/ssl_crtlist-t.h
@@ -23,8 +23,7 @@
 #define _HAPROXY_SSL_CRTLIST_T_H
 #ifdef USE_OPENSSL
 
-#include <import/ebmbtree.h>
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 
 
 /* forward declarations for structures below */
diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index 6772b9812e..6a239715e3 100644
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -23,9 +23,7 @@
 #define _HAPROXY_SSL_SOCK_T_H
 #ifdef USE_OPENSSL
 
-#include <import/eb64tree.h>
-#include <import/ebmbtree.h>
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h> /* struct wait_event */
diff --git a/include/haproxy/stick_table-t.h b/include/haproxy/stick_table-t.h
index f1f9d23e68..d8527b0d29 100644
--- a/include/haproxy/stick_table-t.h
+++ b/include/haproxy/stick_table-t.h
@@ -23,9 +23,7 @@
 #ifndef _HAPROXY_STICK_TABLE_T_H
 #define _HAPROXY_STICK_TABLE_T_H
 
-#include <import/eb32tree.h>
-#include <import/ebmbtree.h>
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/freq_ctr-t.h>
diff --git a/include/haproxy/task-t.h b/include/haproxy/task-t.h
index 415a490cba..5081d985be 100644
--- a/include/haproxy/task-t.h
+++ b/include/haproxy/task-t.h
@@ -24,8 +24,7 @@
 
 #include <sys/time.h>
 
-#include <import/eb32sctree.h>
-#include <import/eb32tree.h>
+#include <import/ebtree-t.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/thread-t.h>
diff --git a/include/haproxy/tcpcheck-t.h b/include/haproxy/tcpcheck-t.h
index 29cb4cc5a5..dcd6e3d6eb 100644
--- a/include/haproxy/tcpcheck-t.h
+++ b/include/haproxy/tcpcheck-t.h
@@ -18,7 +18,7 @@
 #ifndef _HAPROXY_TCPCHECK_T_H
 #define _HAPROXY_TCPCHECK_T_H
 
-#include <import/ebpttree.h>
+#include <import/ebtree-t.h>
 #include <import/ist.h>
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h
index 30a28a214f..6e83594deb 100644
--- a/include/haproxy/xprt_quic-t.h
+++ b/include/haproxy/xprt_quic-t.h
@@ -38,8 +38,7 @@
 #include <haproxy/quic_loss-t.h>
 #include <haproxy/task.h>
 
-#include <import/eb64tree.h>
-#include <import/ebmbtree.h>
+#include <import/ebtree-t.h>
 
 typedef unsigned long long ull;