CLEANUP: threads: remove a few needless includes of hathreads.h

A few files were including it while not needing it (anymore). Some
only required access to the atomic ops and got haproxy/atomic.h in
exchange. Others didn't need it at all. A significant number of
files still include it only for THREAD_LOCAL definition.

diff --git a/include/common/xref.h b/include/common/xref.h
index 610a023c06530161ea78898a828d1896697cf534..bdf292d883081f875b785b12ff4c7a75516d066c 100644 (file)
--- a/include/common/xref.h
+++ b/include/common/xref.h
@@ -1,7 +1,7 @@
 #ifndef __XREF_H__
 #define __XREF_H__
 
-#include <common/hathreads.h>
+#include <haproxy/atomic.h>
 
 /* xref is used to create relation between two elements.
  * Once an element is released, it breaks the relation. If the

diff --git a/include/proto/activity.h b/include/proto/activity.h
index 26365ca8bde3c0ffdaedba42fb90228c30dc80bd..9d5044a08be834a0382baea62083eed74402a54e 100644 (file)
--- a/include/proto/activity.h
+++ b/include/proto/activity.h
@@ -22,8 +22,8 @@
 #ifndef _PROTO_ACTIVITY_H
 #define _PROTO_ACTIVITY_H
 
+#include <haproxy/atomic.h>
 #include <haproxy/api.h>
-#include <common/hathreads.h>
 #include <common/time.h>
 #include <types/activity.h>
 #include <proto/freq_ctr.h>

diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h
index 7413803ef0be0631e5e0d8e2262ccd4e7cf971ee..80529bf23ca48eecd283c210c18b96777d26843f 100644 (file)
--- a/include/proto/freq_ctr.h
+++ b/include/proto/freq_ctr.h
@@ -22,10 +22,10 @@
 #ifndef _PROTO_FREQ_CTR_H
 #define _PROTO_FREQ_CTR_H
 
+#include <haproxy/atomic.h>
 #include <haproxy/api.h>
 #include <common/standard.h>
 #include <common/time.h>
-#include <common/hathreads.h>
 #include <types/freq_ctr.h>
 
 

diff --git a/include/types/fd.h b/include/types/fd.h
index 7ec97bc741c04e8a75076fa64f45903a5b0f6473..505291f9a259775eccf797d9f19306013230c236 100644 (file)
--- a/include/types/fd.h
+++ b/include/types/fd.h
@@ -23,7 +23,6 @@
 #define _TYPES_FD_H
 
 #include <haproxy/api-t.h>
-#include <common/hathreads.h>
 #include <import/ist.h>
 #include <types/port_range.h>
 

diff --git a/include/types/queue.h b/include/types/queue.h
index 9333468949519e67ed54161ef9fc55fcd23333dc..d2cb0fffbccc40273ebcdd23e4a779ebdb812c83 100644 (file)
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
-#include <common/hathreads.h>
 
 #include <types/server.h>
 

diff --git a/src/filters.c b/src/filters.c
index f8cb526692f1eaa2e61a63cdbd54ae745893b738..e9f846b6626fdc8589d8c2af0a7f59d60d492863 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -17,7 +17,6 @@
 #include <common/htx.h>
 #include <common/namespace.h>
 #include <common/standard.h>
-#include <common/hathreads.h>
 
 #include <types/filters.h>
 #include <types/http_ana.h>

diff --git a/src/flt_trace.c b/src/flt_trace.c
index a3362963607146a9db906a161d674310778115af..fdc74a7eb52f26dd3128d87f20d31164d2fd16af 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,7 +13,6 @@
 #include <ctype.h>
 
 #include <haproxy/api.h>
-#include <common/hathreads.h>
 #include <common/htx.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/signal.c b/src/signal.c
index 288ef007db534b2fd5541178d71530d805ace0af..d989ef66bb0bb7e17d3618417bc9de9e5d990357 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -13,8 +13,6 @@
 #include <signal.h>
 #include <string.h>
 
-#include <common/hathreads.h>
-
 #include <proto/signal.h>
 #include <proto/log.h>
 #include <proto/task.h>