REORG: include: move THREAD_LOCAL and __decl_thread() to compiler.h

Since these are used as type attributes or conditional clauses, they
are used about everywhere and should not require a dependency on
thread.h. Moving them to compiler.h along with other similar statements
like ALIGN() etc looks more logical; this way they become part of the
base API. This allowed to remove thread-t.h from ~12 files, one was
found to only require thread-t and not thread and dict.c was found to
require thread.h.

include/haproxy/compiler.h

@@ -223,4 +223,24 @@
 #endif
 #endif
 
+/* The THREAD_LOCAL type attribute defines thread-local storage and is defined
+ * to __thread when threads are enabled or empty when disabled.
+ */
+#ifdef USE_THREAD
+#define THREAD_LOCAL __thread
+#else
+#define THREAD_LOCAL
+#endif
+
+/* The __decl_thread() statement is shows the argument when threads are enabled
+ * or hides it when disabled. The purpose is to condition the presence of some
+ * variables or struct members to the fact that threads are enabled, without
+ * having to enclose them inside a #ifdef USE_THREAD/#endif clause.
+ */
+#ifdef USE_THREAD
+#define __decl_thread(decl) decl
+#else
+#define __decl_thread(decl)
+#endif
+
 #endif /* _HAPROXY_COMPILER_H */

include/haproxy/dict-t.h

@@ -29,7 +29,7 @@
 
 #include <import/ebpttree.h>
 #include <haproxy/api-t.h>
-#include <haproxy/thread.h>
+#include <haproxy/thread-t.h>
 
 struct dict_entry {
 	struct ebpt_node value;

include/haproxy/global.h

@@ -24,7 +24,6 @@
 
 #include <haproxy/global-t.h>
 #include <haproxy/api-t.h>
-#include <haproxy/thread.h>
 #include <haproxy/vars-t.h>
 #include <haproxy/mworker-t.h>
 

include/haproxy/log.h

@@ -29,7 +29,6 @@
 #include <haproxy/pool-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream.h>
-#include <haproxy/thread-t.h>
 
 extern struct pool_head *pool_head_requri;
 extern struct pool_head *pool_head_uniqueid;

include/haproxy/regex-t.h

@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <haproxy/thread-t.h>
 
 #ifdef USE_PCRE
 #include <pcre.h>

include/haproxy/regex.h

@@ -27,7 +27,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/regex-t.h>
-#include <haproxy/thread-t.h>
 
 extern THREAD_LOCAL regmatch_t pmatch[MAX_MATCH];
 

include/haproxy/thread-t.h

@@ -40,10 +40,7 @@
 
 /********************** THREADS DISABLED ************************/
 
-#define THREAD_LOCAL  /* empty */
-
 /* These macros allow to make some struct fields or local variables optional */
-#define __decl_thread(decl)
 #define __decl_spinlock(lock)
 #define __decl_aligned_spinlock(lock)
 #define __decl_rwlock(lock)
@@ -53,10 +50,6 @@
 
 /********************** THREADS ENABLED ************************/
 
-#define THREAD_LOCAL __thread
-
-#define __decl_thread(decl) decl
-
 /* declare a self-initializing spinlock */
 #define __decl_spinlock(lock)                               \
 	HA_SPINLOCK_T (lock);                               \

include/haproxy/trace.h

@@ -26,7 +26,6 @@
 #include <haproxy/api.h>
 #include <haproxy/list.h>
 #include <haproxy/sink-t.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace-t.h>
 

src/dict.c

@@ -3,6 +3,7 @@
 #include <import/eb32tree.h>
 #include <import/ebistree.h>
 #include <haproxy/dict.h>
+#include <haproxy/thread.h>
 
 struct dict *new_dict(const char *name)
 {

src/ev_epoll.c

@@ -17,7 +17,6 @@
 #include <haproxy/api.h>
 #include <haproxy/global.h>
 #include <haproxy/signal.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>

src/ev_evports.c

@@ -20,7 +20,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/signal.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 

src/ev_kqueue.c

@@ -19,7 +19,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/signal.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 

src/ev_poll.c

@@ -18,7 +18,6 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 

src/ev_select.c

@@ -15,7 +15,6 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 

src/time.c

@@ -16,7 +16,6 @@
 #include <haproxy/api.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
-#include <haproxy/thread-t.h>
 
 THREAD_LOCAL unsigned int   ms_left_scaled;  /* milliseconds left for current second (0..2^32-1) */
 THREAD_LOCAL unsigned int   now_ms;          /* internal date in milliseconds (may wrap) */