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 084b15edabe9d77528e3756b734285b8bc02e9be..21b744dcb5fe4475607c483711cdf02fd0a3b352 100644 (file)
--- 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 0372ebfcdca603284d548f7a8b739d2cc0afc243..0ba8555ff3d9e4bdf02290f04aaa364111d36824 100644 (file)
--- 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 cb2ea9003c5c154566ce99b3ee23f3f144572bfa..b8124e363754e90399077698f7bd6f04a99ef5cb 100644 (file)
--- 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 1e68944edac4bd529c3db6ddce64078cece00408..461a5d19a0a58b9421e5856126221a9077371d75 100644 (file)
--- 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 10cb1785f58db15fe5b0922361879ff3c74ab8d8..542d586e8ea717c5c1620a63df1bbcd26eaa340d 100644 (file)
--- 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 fa694b5323c35c647515ca0c65b0d411b631f5a5..3d33834c7678b3c5eb8b031c6fc7ee5a94bda71f 100644 (file)
--- 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 e96193e4ba30d4bb36d414e70c38c29c03f5f6ef..c4379819f454cf6d12ee350093efb550d405fcac 100644 (file)
--- 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 e5b1aebd41956b7f1215dd3148284ed7b64d9c8b..cfb274cb2f8ce23816989d11271a1405e2c01399 100644 (file)
--- 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 e5064be1153a23f9df47da409db40493095c131c..258a6ab95d4c45033b1267c7bf000e8fd1dd1d6d 100644 (file)
--- 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 0e12e1ba0bd88a2329abedf8e60d236dee279307..f7b746e83b83ba9860f7c9f6a7b880376f909455 100644 (file)
--- 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 70839eef047ded0fec1e81059b3c6b88502ab1f1..66cabee9fd74a0c2b3196b581a0e7fa6751cbce3 100644 (file)
--- 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 8907249b872c517cde4ad2d414d1134e6adde969..4dc86d2ee9a52a22e52c9271fd71267e5f1eb0e5 100644 (file)
--- 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 b86ae31a5f22015bd22a98fec847c0e4b051fac8..fe465775b857f275f5b171b33c5da02744dec3e4 100644 (file)
--- 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 27305b2d17ca27f0125d3e88c64b7c85f527cf7d..32802d41c0af1228cf38ddf20aceabfb088555ba 100644 (file)
--- 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 0c712e5a1704fd41476a003b77e3eb6d3fa29ade..6d2a9688a9978024370002121b96f7a12cfab243 100644 (file)
--- 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 ce92765eaa9949f3610a86659001b97224a7e10b..7ce73db8742971cebc25bfbc49320fa40dfb1372 100644 (file)
--- 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 38a6ca972d0b178921693d93b06919eb17e98995..5ef47c3f437c9113311afd2722c9815cd42b59f7 100644 (file)
--- 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 266744909a0f1a34106893c78dfe1a74fe5099e2..8f6a1ec8d54e6ea283d9efbf899fed96486e3234 100644 (file)
--- 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 13b4cbfa0997b7ed4d6d560211e4ebd427be2155..f174073195b95940c9ce79ddb0bd784367efc514 100644 (file)
--- 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 97c0d9ee33e566041b44f576274022eaf121f414..463e24bea9e966db99e0e257bd6544badce1bcf2 100644 (file)
--- 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 fbd3cb7cb8a6d045a4619fd790e2e5e0a10d7f80..80c98647fdffab543e3af18fe665c08927b3921f 100644 (file)
--- 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 2589a526e8ba9aab19635374c6c67e8b2aeb930f..7f13f3d7d3a716c940a3e9cabb98f9a699e8016d 100644 (file)
--- 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 7ec8aa9f0b198003f1f37265c240bf41623c3e3a..dc7a3764a8d7e0ec73c6f9636eebd2d97bc4f4f3 100644 (file)
--- 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 6772b9812e8c93634db9d045a41983fbb2d21bdf..6a239715e385c2b1a3f4f0f637ce2ffd8db6d3ad 100644 (file)
--- 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 f1f9d23e687af319963b69a6c63a9604af03405f..d8527b0d297b117657e4b0dffb1c2d2b9b6aa030 100644 (file)
--- 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 415a490cba929e1a725672a4611b40b7c7156045..5081d985be25a4d65b1c7cec16dcdebc43823196 100644 (file)
--- 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 29cb4cc5a5543187b14ea50bbd427c3c2fb4cc77..dcd6e3d6ebff3b69b50c3b31061d5f345af53686 100644 (file)
--- 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 30a28a214f3acafa95b12df8fc54b23678cab687..6e83594debfac0a3fcbb9d2b9b91945ed7f08100 100644 (file)
--- 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;