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

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

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:

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:

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;
 

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

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)

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>

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 = { };