REORG: include: move common/buffer.h to haproxy/dynbuf{,-t}.h

The pretty confusing "buffer.h" was in fact not the place to look for
the definition of "struct buffer" but the one responsible for dynamic
buffer allocation. As such it defines the struct buffer_wait and the
few functions to allocate a buffer or wait for one.

This patch moves it renaming it to dynbuf.h. The type definition was
moved to its own file since it's included in a number of other structs.

Doing this cleanup revealed that a significant number of files used to
rely on this one to inherit struct buffer through it but didn't need
anything from this file at all.

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index fe3431ccb4e87402daa04afd5351758b17e52986..fe2520d62bd88464bafeb7da63e1d5a396a0601c 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -15,7 +15,6 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/buffer.h>
 #include <common/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>

diff --git a/include/common/h1.h b/include/common/h1.h
index 1295b142005682a751f2ac0ea59855ee1588d152..205a25ce2595a61a3358531950fa3d008e503cf5 100644 (file)
--- a/include/common/h1.h
+++ b/include/common/h1.h
@@ -23,8 +23,8 @@
 #define _COMMON_H1_H
 
 #include <haproxy/api.h>
+#include <haproxy/dynbuf.h>
 #include <haproxy/intops.h>
-#include <common/buffer.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 #include <import/ist.h>

diff --git a/include/haproxy/dynbuf-t.h b/include/haproxy/dynbuf-t.h
new file mode 100644 (file)
index 0000000..451d58c
--- /dev/null
+++ b/include/haproxy/dynbuf-t.h
@@ -0,0 +1,42 @@
+/*
+ * include/haproxy/dynbuf-t.h
+ * Structure definitions for dynamic buffer management.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _HAPROXY_DYNBUF_T_H
+#define _HAPROXY_DYNBUF_T_H
+
+#include <haproxy/list-t.h>
+
+/* an element of the <buffer_wq> list. It represents an object that need to
+ * acquire a buffer to continue its process. */
+struct buffer_wait {
+       void *target;              /* The waiting object that should be woken up */
+       int (*wakeup_cb)(void *);  /* The function used to wake up the <target>, passed as argument */
+       struct mt_list list;        /* Next element in the <buffer_wq> list */
+};
+
+#endif /* _HAPROXY_DYNBUF_T_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */

diff --git a/include/common/buffer.h b/include/haproxy/dynbuf.h
similarity index 90%
rename from include/common/buffer.h
rename to include/haproxy/dynbuf.h
index 4e19c22c2f0611d91919db4a9292e3eedf4ca24b..01a784d4f79d6d05c6667118f898983621d77cc9 100644 (file)
--- a/include/common/buffer.h
+++ b/include/haproxy/dynbuf.h
@@ -1,8 +1,8 @@
 /*
- * include/common/buffer.h
- * Buffer management definitions, macros and inline functions.
+ * include/haproxy/dynbuf.h
+ * Buffer management functions.
  *
- * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,30 +19,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_BUFFER_H
-#define _COMMON_BUFFER_H
+#ifndef _HAPROXY_DYNBUF_H
+#define _HAPROXY_DYNBUF_H
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
-#include <import/ist.h>
-#include <haproxy/istbuf.h>
+#include <haproxy/dynbuf-t.h>
+#include <haproxy/list-t.h>
 #include <haproxy/pool.h>
 
-#include <haproxy/activity.h>
-
-/* an element of the <buffer_wq> list. It represents an object that need to
- * acquire a buffer to continue its process. */
-struct buffer_wait {
-       void *target;              /* The waiting object that should be woken up */
-       int (*wakeup_cb)(void *);  /* The function used to wake up the <target>, passed as argument */
-       struct mt_list list;        /* Next element in the <buffer_wq> list */
-};
-
 extern struct pool_head *pool_head_buffer;
 extern struct mt_list buffer_wq;
 __decl_thread(extern HA_SPINLOCK_T buffer_wq_lock);
@@ -210,7 +202,7 @@ static inline void offer_buffers(void *from, unsigned int threshold)
 }
 
 
-#endif /* _COMMON_BUFFER_H */
+#endif /* _HAPROXY_DYNBUF_H */
 
 /*
  * Local variables:

diff --git a/include/proto/channel.h b/include/proto/channel.h
index a36b63a61f7feb742b08a4ab7331f0e01f474e1f..d343c027626a000c547bf95fbf7ca572a88d04ff 100644 (file)
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -29,6 +29,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dynbuf.h>
 #include <common/htx.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>

diff --git a/include/proto/session.h b/include/proto/session.h
index 866217ec2864fb53558a47adfe842a84e44b0e5b..a52e982c9c32a2a980a227631dd53ed7b5d00d37 100644 (file)
--- a/include/proto/session.h
+++ b/include/proto/session.h
@@ -23,7 +23,6 @@
 #define _PROTO_SESSION_H
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
 #include <haproxy/pool.h>
 
 #include <types/global.h>

diff --git a/include/proto/trace.h b/include/proto/trace.h
index 7a2b5e7e1034b30b7d1e5ca887909a762ed9bce4..f16763d7f19716dadf40f431a374cf9933f88114 100644 (file)
--- a/include/proto/trace.h
+++ b/include/proto/trace.h
@@ -23,7 +23,6 @@
 #define _PROTO_TRACE_H
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
 #include <common/standard.h>
 #include <import/ist.h>
 #include <haproxy/list.h>

diff --git a/include/types/applet.h b/include/types/applet.h
index ac7f38d714febab785b619d2da926feb4429301e..7b21f9ab39dd201f672df715327e56767fb54f26 100644 (file)
--- a/include/types/applet.h
+++ b/include/types/applet.h
@@ -23,13 +23,13 @@
 #define _TYPES_APPLET_H
 
 #include <haproxy/api-t.h>
+#include <haproxy/buf.h>
+#include <haproxy/dynbuf-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/hlua.h>
 #include <types/obj_type.h>
 #include <types/proxy.h>
 #include <types/stream.h>
-#include <common/buffer.h>
-#include <haproxy/chunk.h>
 #include <common/xref.h>
 
 struct appctx;

diff --git a/include/types/channel.h b/include/types/channel.h
index 863c3fba69767222e3e9e8d7bbe0b09e616416f1..d3823f26261fd0e05e291ff49a6194cba1eff184 100644 (file)
--- a/include/types/channel.h
+++ b/include/types/channel.h
@@ -23,7 +23,7 @@
 #define _TYPES_CHANNEL_H
 
 #include <haproxy/api-t.h>
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 
 /* The CF_* macros designate Channel Flags, which may be ORed in the bit field
  * member 'flags' in struct channel. Here we have several types of flags :

diff --git a/include/types/compression.h b/include/types/compression.h
index fc2ad26687c5067cf75bae82c249f042717f806a..16049099924abb5853e1a5bb61061d6b02cce8fc 100644 (file)
--- a/include/types/compression.h
+++ b/include/types/compression.h
@@ -32,7 +32,7 @@
 #include <zlib.h>
 #endif
 
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 
 struct comp {
        struct comp_algo *algos;

diff --git a/include/types/sink.h b/include/types/sink.h
index 3feb05ddf753fdc61af0d3d7db62da4026effd34..aad6ba7d1690cf95e4fc1c6c5f413c62f10a5b66 100644 (file)
--- a/include/types/sink.h
+++ b/include/types/sink.h
@@ -23,8 +23,8 @@
 #define _TYPES_SINK_H
 
 #include <haproxy/api-t.h>
-#include <common/buffer.h>
 #include <import/ist.h>
+#include <haproxy/api.h>
 
 /* A sink may be of 4 distinct types :
  *   - file descriptor (such as stdout)

diff --git a/include/types/spoe.h b/include/types/spoe.h
index 42b4bd5a4188aaf1d0a5cf52529190c8458686d3..f08b9adcdd81621bda49e183592dd6dcd3e9ee6c 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -24,7 +24,7 @@
 
 #include <sys/time.h>
 
-#include <common/buffer.h>
+#include <haproxy/dynbuf-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread.h>
 

diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index 27633ecbd1800906f7460d58cda28c64f544ef62..ca41ffc2c009d3865106baed44059031f0199b04 100644 (file)
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -31,7 +31,7 @@
 #include <types/ssl_ckch.h>
 #include <types/ssl_crtlist.h>
 
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/list-t.h>
 #include <haproxy/openssl-compat.h>

diff --git a/include/types/stream.h b/include/types/stream.h
index 37bdb96c56009d7a65496ecf8673165df83ae4a8..08e0f1255a02ee8f9c732dd9a69725458f235503 100644 (file)
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -29,6 +29,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
+#include <haproxy/dynbuf-t.h>
 #include <haproxy/list-t.h>
 
 #include <types/channel.h>

diff --git a/include/types/trace.h b/include/types/trace.h
index c119ab33f0dc080a4a1535788c4f6ee942017501..2114d410f6c60a18d99613108e53b312f57fac55 100644 (file)
--- a/include/types/trace.h
+++ b/include/types/trace.h
@@ -23,7 +23,6 @@
 #define _TYPES_TRACE_H
 
 #include <haproxy/api-t.h>
-#include <common/buffer.h>
 #include <import/ist.h>
 #include <haproxy/list-t.h>
 #include <types/sink.h>

diff --git a/src/51d.c b/src/51d.c
index c53d68138fb1193583a4a2f190ab4026dcd5b6b7..ab628fe642b5fd94815270cfcb79d99a123f5258 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -3,7 +3,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/thread.h>
 #include <types/global.h>

diff --git a/src/backend.c b/src/backend.c
index ff6c37d2bdd760ec31534d69099b7fecbb7aa96c..c9abbc7ab3f2a515eb7a679b3be28be8b8935ecf 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
 #include <haproxy/hash.h>
 #include <common/htx.h>
 #include <common/ticks.h>

diff --git a/src/buffer.c b/src/buffer.c
index ec07e76e6beb92534c230377dcf90554b10f6d82..b41716b7e246425bdfb894d752ac7ac2ad635694 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -15,7 +15,8 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/dynbuf.h>
+#include <haproxy/list.h>
 #include <haproxy/pool.h>
 
 #include <types/global.h>

diff --git a/src/channel.c b/src/channel.c
index cd7da30b400336a51ae702e742b56dbae379ff6c..ae5c981c7246009c79c6874e864c8e05b7737a47 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/buf.h>
 
 #include <proto/channel.h>
 

diff --git a/src/checks.c b/src/checks.c
index 0a1d0e2e0db16d4b1c5a98538038a77cee32e91a..45de864c3f87b80f8db8efe1ad3f165a2c0b87b0 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -33,6 +33,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/istbuf.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
 #include <haproxy/time.h>

diff --git a/src/compression.c b/src/compression.c
index 45471c33397fd2acda7e873a6544cc0154cded02..f1d739e70d2a550b0ea0c9b4033b3e4f4f81f66b 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -27,6 +27,7 @@
 #endif /* USE_ZLIB */
 
 #include <haproxy/api.h>
+#include <haproxy/dynbuf.h>
 #include <common/cfgparse.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>

diff --git a/src/filters.c b/src/filters.c
index e9f846b6626fdc8589d8c2af0a7f59d60d492863..1b715735308a528c2c2cb2f475e979c33e0695ca 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <common/htx.h>

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 9ca51e538c5bec10dece202ce5e087d3dd3f7d71..4b0e546ab6667400626eab19955d7bd836b322d7 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/dynbuf.h>
 #include <common/cfgparse.h>
 #include <common/htx.h>
 #include <haproxy/list.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 99e89075ef6ae9949ba81e526cefebd9bfcfbf1f..f178e51f65ad0e98c538787c8662843f2c7331c2 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -84,6 +84,7 @@
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 1c75e93cd12fcd09515de3432c85929f64c1ae4c..963ed16afb26d0701658e11cace9c7b6fd43e8f9 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -10,6 +10,7 @@
  *
  */
 #include <haproxy/api.h>
+#include <haproxy/istbuf.h>
 #include <common/cfgparse.h>
 #include <common/h1.h>
 #include <common/h2.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3c0ef5f8e26dfb5be734a2b4f5b59ee3a9588b1a..7050469a7efdf3d64e8a298d7084e82822c4e795 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -11,6 +11,7 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/istbuf.h>
 #include <common/cfgparse.h>
 #include <common/h1.h>
 #include <common/h2.h>

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 4033625feb0f019fc1e42413d0c2e2dbf9cafddf..faa8e1e97241d814d004cfd4e9b432387f283288 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -23,7 +23,7 @@
 #include <netinet/tcp.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/buf.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>

diff --git a/src/session.c b/src/session.c
index 804416901c5b9afd190d47daad76e24b8e64c02f..d31806a2ba28ac8459ed0271f26ae9b6ff82f68d 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -11,7 +11,6 @@
  */
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
 #include <common/http.h>
 #include <haproxy/pool.h>
 

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 8bc78e1c686798f09767f95b3bdc84893ef56732..de3abeeb4ec6d608bce0191f6deee78f840f69a4 100644 (file)
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/openssl-compat.h>
 #include <common/standard.h>
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index fe194b7a743178eef708c867b0b7f362b32fedb4..e89fa5ae65840348c0b415d7ac7dcc113affb37a 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -44,7 +44,7 @@
 #include <import/lru.h>
 #include <import/xxhash.h>
 
-#include <common/buffer.h>
+#include <haproxy/dynbuf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/openssl-compat.h>

diff --git a/src/ssl_utils.c b/src/ssl_utils.c
index 10b71d565294008f74c37ea4b6da7114fc686cb7..38efe7ec463452367fd90275e490552ec769cc77 100644 (file)
--- a/src/ssl_utils.c
+++ b/src/ssl_utils.c
@@ -12,7 +12,8 @@
  */
 
 
-#include <common/buffer.h>
+#include <haproxy/api.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/openssl-compat.h>
 
 #include <proto/ssl_sock.h>

diff --git a/src/stream.c b/src/stream.c
index b6b2e1450cf951391a8cd0db5e4e3aa3371dc170..4af498602759cfbf0559be76d3e245081f23d636 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -16,7 +16,8 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/buffer.h>
+#include <haproxy/dynbuf.h>
+#include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
 #include <common/htx.h>
 #include <haproxy/pool.h>

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 89f37ee13f236e5f3c0282b2cda0d275b41284b4..d0f5f1abee2564369edb1f8859f59f2a7fcff269 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <common/buffer.h>
+#include <haproxy/dynbuf.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>

diff --git a/src/trace.c b/src/trace.c
index a0b9648844a9207373a160e90890c3ccf2204b98..4111bdbb7656246d5742b0ad1bbd1f5e7f9697ca 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <haproxy/api.h>
-#include <common/buffer.h>
 #include <import/ist.h>
+#include <haproxy/api.h>
+#include <haproxy/buf.h>
+#include <haproxy/istbuf.h>
 #include <haproxy/list.h>
 #include <proto/cli.h>
 #include <proto/log.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index 65a591732d2f1ccface3c2b10990da26c6233411..0bc10fa989ef1e18ea338bd133c56d3d1af7b01c 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -2,9 +2,9 @@
 #include <stdarg.h>
 
 #include <haproxy/api.h>
+#include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <common/buffer.h>
 #include <haproxy/errors.h>
 #include <types/global.h>
 #include <proto/arg.h>