X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fltt-events.c;h=2595ea89b11fd89e8cbfa375a00588eb15b98c86;hb=44c72f10aa3cace72ffe40a0f9bb7aadb9c82dc8;hp=c97727348cb18834fb4a38e3b763f30e7fab3eae;hpb=23c8854a5fa1120df5cfdfbf08f00e00976f95fa;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index c9772734..2595ea89 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -14,31 +14,36 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
-#include <urcu-bp.h>
-#include <urcu/compiler.h>
-#include <urcu/uatomic.h>
 #include <uuid/uuid.h>
-#include <lttng/tracepoint.h>
 #include <errno.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu-bp.h>
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+#include <urcu/arch.h>
+
+#include <lttng/tracepoint.h>
 #include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/core.h"
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
 #include "ltt-tracer.h"
 #include "ltt-tracer-core.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
-#include <stdint.h>
-#include <stddef.h>
-#include <urcu/arch.h>
+#include "jhash.h"
 
 /*
  * The sessions mutex is the centralized mutex across UST tracing
  * control and probe registration. All operations within this file are
  * called by the communication thread, under ust_lock protection.
  */
-static DEFINE_MUTEX(sessions_mutex);
+static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void ust_lock(void)
 {