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

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 4c41531a..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 "lttng/wait.h"
+#include "wait.h"
 #include "../libringbuffer/shm.h"
-
-typedef u32 uint32_t;
-#include <lttng/kcompat/jhash.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)
 {
@@ -87,7 +92,7 @@ int add_pending_probe(struct ltt_event *event, const char *name)
 	struct cds_hlist_head *head;
 	struct ust_pending_probe *e;
 	size_t name_len = strlen(name) + 1;
-	u32 hash = jhash(name, name_len - 1, 0);
+	uint32_t hash = jhash(name, name_len - 1, 0);
 
 	head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
 	e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
@@ -126,7 +131,7 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 	struct ust_pending_probe *e;
 	const char *name = desc->name;
 	size_t name_len = strlen(name) + 1;
-	u32 hash = jhash(name, name_len - 1, 0);
+	uint32_t hash = jhash(name, name_len - 1, 0);
 	int ret = 0;
 
 	head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
@@ -718,7 +723,7 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 
 	ret = lttng_metadata_printf(session,
 		"event {\n"
-		"	name = %s;\n"
+		"	name = \"%s\";\n"
 		"	id = %u;\n"
 		"	stream_id = %u;\n",
 		event->desc->name,