core: use monkey/mk_core.h instead of direct pthread.h

Signed-off-by: Eduardo Silva <[email protected]>
fluent · Dec 15, 2016 · c99e982 · c99e982
1 parent 8f839b9
commit c99e982
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 15 deletions.
diff --git a/include/fluent-bit/flb_log.h b/include/fluent-bit/flb_log.h
@@ -20,13 +20,13 @@
 #ifndef FLB_LOG_H
 #define FLB_LOG_H
 
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_macros.h>
 #include <fluent-bit/flb_thread_storage.h>
 #include <fluent-bit/flb_worker.h>
 
 #include <inttypes.h>
-#include <pthread.h>
 #include <errno.h>
 
 /* FIXME: this extern should be auto-populated from flb_thread_storage.h */

diff --git a/include/fluent-bit/flb_task.h b/include/fluent-bit/flb_task.h
@@ -20,7 +20,7 @@
 #ifndef FLB_TASK_H
 #define FLB_TASK_H
 
-#include <pthread.h>
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_buffer.h>
 #include <fluent-bit/flb_input.h>

diff --git a/include/fluent-bit/flb_thread_libco.h b/include/fluent-bit/flb_thread_libco.h
@@ -20,6 +20,7 @@
 #ifndef FLB_THREAD_LIBCO_H
 #define FLB_THREAD_LIBCO_H
 
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_mem.h>
 #include <fluent-bit/flb_macros.h>
@@ -28,7 +29,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <ucontext.h>
-#include <pthread.h>
 #include <libco.h>
 
 #ifdef FLB_HAVE_VALGRIND

diff --git a/include/fluent-bit/flb_thread_pthreads.h b/include/fluent-bit/flb_thread_pthreads.h
@@ -21,8 +21,8 @@
 #define FLB_THREAD_PTHREADS_H
 
 #include <stdlib.h>
-#include <pthread.h>
 
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_mem.h>
 #include <fluent-bit/flb_macros.h>

diff --git a/include/fluent-bit/flb_thread_ucontext.h b/include/fluent-bit/flb_thread_ucontext.h
@@ -20,6 +20,7 @@
 #ifndef FLB_THREAD_UCONTEXT_H
 #define FLB_THREAD_UCONTEXT_H
 
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_mem.h>
 #include <fluent-bit/flb_macros.h>
@@ -28,7 +29,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <ucontext.h>
-#include <pthread.h>
 
 #ifdef FLB_HAVE_VALGRIND
 #include <valgrind/valgrind.h>

diff --git a/include/fluent-bit/flb_upstream.h b/include/fluent-bit/flb_upstream.h
@@ -20,7 +20,8 @@
 #ifndef FLB_UPSTREAM_H
 #define FLB_UPSTREAM_H
 
-#include <pthread.h>
+
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_config.h>
 
 /*

diff --git a/lib/monkey/include/monkey/mk_core/mk_pthread.h b/lib/monkey/include/monkey/mk_core/mk_pthread.h
@@ -20,12 +20,12 @@
 #ifndef MK_PTHREAD_H
 #define MK_PTHREAD_H
 
-#include <mk_core/mk_core_info.h>
+#include "mk_core_info.h"
 
 #ifdef MK_THREADS_POSIX /* Heaven */
 #include <pthread.h>
 #elif MK_THREADS_WIN32 /* Not Heaven */
-#include <mk_core/external/winpthreads.h>
+#include "external/winpthreads.h"
 #endif
 
 #endif
diff --git a/lib/monkey/include/monkey/mk_core/mk_utils.h b/lib/monkey/include/monkey/mk_core/mk_utils.h
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <mk_core/mk_pthread.h>
+#include "mk_pthread.h"
 
 time_t mk_core_init_time;
 char *env_trace_filter;

diff --git a/src/flb_buffer_qchunk.c b/src/flb_buffer_qchunk.c
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_mem.h>
 #include <fluent-bit/flb_str.h>
@@ -32,7 +33,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <pthread.h>
 
 /* qworker thread initializator */
 static int pth_init;

diff --git a/src/flb_http_server.c b/src/flb_http_server.c
@@ -17,10 +17,10 @@
  * limitations under the License.
  */
 
+#include <monkey/mk_core.h>
 #include <monkey/mk_lib.h>
 #include <fluent-bit/flb_lib.h>
 #include <fluent-bit/flb_http_server.h>
-#include <pthread.h>
 
 static void cb_root(mk_session_t *session, mk_request_t *request)
 {

diff --git a/src/flb_lib.c b/src/flb_lib.c
@@ -18,7 +18,6 @@
  */
 
 #include <signal.h>
-#include <unistd.h>
 #include <stdarg.h>
 
 #include <fluent-bit/flb_lib.h>

diff --git a/src/flb_log.c b/src/flb_log.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <inttypes.h>
-#include <pthread.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/flb_thread_pthreads.c b/src/flb_thread_pthreads.c
@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 
-#include <pthread.h>
-
+#include <monkey/mk_core.h>
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_log.h>
 #include <fluent-bit/flb_output.h>