REORG: include: move trace.h to haproxy/trace{,-t}.h

Only thread-t was added to satisfy THREAD_LOCAL but the rest was OK.

diff --git a/include/types/trace.h b/include/haproxy/trace-t.h
similarity index 98%
rename from include/types/trace.h
rename to include/haproxy/trace-t.h
index 537ac32c7c948a061ca2878c2357515b88a13293..b8295bd52d3433c505f7a9237003c46309be3de3 100644 (file)
--- a/include/types/trace.h
+++ b/include/haproxy/trace-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/trace.h
+ * include/haproxy/trace-t.h
  * This file provides definitions for runtime tracing
  *
  * Copyright (C) 2000-2019 Willy Tarreau - w@1wt.eu
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_TRACE_H
-#define _TYPES_TRACE_H
+#ifndef _HAPROXY_TRACE_T_H
+#define _HAPROXY_TRACE_T_H
 
-#include <haproxy/api-t.h>
 #include <import/ist.h>
 #include <haproxy/list-t.h>
 #include <haproxy/sink-t.h>
+#include <haproxy/api-t.h>
 
 /* the macros below define an optional type for each of the 4 args passed to
  * the trace() call. When such a type is set, the caller commits to exclusively
@@ -148,7 +148,7 @@ struct trace_source {
        const void *lockon_ptr;  // what to lockon when lockon is set
 };
 
-#endif /* _TYPES_TRACE_H */
+#endif /* _HAPROXY_TRACE_T_H */
 
 /*
  * Local variables:

diff --git a/include/proto/trace.h b/include/haproxy/trace.h
similarity index 97%
rename from include/proto/trace.h
rename to include/haproxy/trace.h
index def25e09f400f1fdfe0b03e24f6c32e2935082f0..0367aa73eebd9300eb550c2b9103f0319785d55c 100644 (file)
--- a/include/proto/trace.h
+++ b/include/haproxy/trace.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/trace.h
+ * include/haproxy/trace.h
  * This file provides functions for runtime tracing
  *
  * Copyright (C) 2000-2019 Willy Tarreau - w@1wt.eu
@@ -19,16 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_TRACE_H
-#define _PROTO_TRACE_H
+#ifndef _HAPROXY_TRACE_H
+#define _HAPROXY_TRACE_H
 
-#include <haproxy/api.h>
-#include <haproxy/tools.h>
 #include <import/ist.h>
+#include <haproxy/api.h>
 #include <haproxy/list.h>
-#include <types/log.h>
 #include <haproxy/sink-t.h>
-#include <types/trace.h>
+#include <haproxy/thread-t.h>
+#include <haproxy/tools.h>
+#include <haproxy/trace-t.h>
+#include <types/log.h>
 
 /* Make a string from the location of the trace producer as "file:line" */
 #define TRC_LOC  _TRC_LOC(__FILE__, __LINE__)
@@ -151,7 +152,7 @@ static inline void trace(enum trace_level level, uint64_t mask, struct trace_sou
                __trace(level, mask, src, where, func, a1, a2, a3, a4, cb, msg);
 }
 
-#endif /* _PROTO_TRACE_H */
+#endif /* _HAPROXY_TRACE_H */
 
 /*
  * Local variables:

diff --git a/include/proto/stream.h b/include/proto/stream.h
index 80a616b6e1732204dfb2f13788201424b5bd6bc6..59a95f9554f8de64753b67963d1ed091316c18ea 100644 (file)
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -32,7 +32,7 @@
 #include <proto/queue.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/task.h>
-#include <proto/trace.h>
+#include <haproxy/trace.h>
 
 extern struct trace_source trace_strm;
 

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index ed97d6b3505e22d4a92ae6f0fd2959e953429617..6346c8e70720452866728bda25445006165ab3b2 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -31,7 +31,7 @@
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/trace.h>
+#include <haproxy/trace.h>
 
 /* FCGI Connection flags (32 bits) */
 #define FCGI_CF_NONE           0x00000000

diff --git a/src/mux_h1.c b/src/mux_h1.c
index a5c5009336c7f6b804737bbe4a26be1a124267e9..678853062ff0b1ab30683a28e862a1a206aa0bf9 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -28,7 +28,7 @@
 #include <haproxy/session-t.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
-#include <proto/trace.h>
+#include <haproxy/trace.h>
 
 /*
  *  H1 Connection flags (32 bits)

diff --git a/src/mux_h2.c b/src/mux_h2.c
index ac4098132781bffebc47e9f540d0adc1c21cec06..3497201bcd926a636b36a800d2d639e82171e6b7 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -23,7 +23,7 @@
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
-#include <proto/trace.h>
+#include <haproxy/trace.h>
 #include <proto/stream.h>
 #include <proto/stream_interface.h>
 #include <import/eb32tree.h>

diff --git a/src/trace.c b/src/trace.c
index c8cb4c15f8ff2249d5c2e9d4a8ae943b7398c9e3..2c7bbb67c75648df4b4eb73c7285b4d017143c28 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -26,7 +26,7 @@
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <haproxy/sink.h>
-#include <proto/trace.h>
+#include <haproxy/trace.h>
 
 struct list trace_sources = LIST_HEAD_INIT(trace_sources);
 THREAD_LOCAL struct buffer trace_buf = { };