X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-events.c;h=68531bcd628e435e62805d52b5f593054ec5089b;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=c9a7773fa744959c0633750d56f7e06dbd5af5d3;hpb=8a98a75d15312b109a29c3dad982d534e2c116c9;p=lttng-ust.git

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index c9a7773f..68531bcd 100644
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -18,20 +18,20 @@
 #include <urcu/compiler.h>
 #include <urcu/uatomic.h>
 #include <uuid/uuid.h>
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 #include <errno.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#include <ust/lttng-events.h>
-#include <ust/usterr-signal-safe.h>
-#include "ust/core.h"
+#include <lttng/ust-events.h>
+#include <lttng/usterr-signal-safe.h>
+#include "lttng/core.h"
 #include "ltt-tracer.h"
 #include "ltt-tracer-core.h"
-#include "ust/wait.h"
+#include "lttng/wait.h"
 #include "../libringbuffer/shm.h"
 
 typedef u32 uint32_t;
-#include <ust/kcompat/jhash.h>
+#include <lttng/kcompat/jhash.h>
 
 /*
  * The sessions mutex is the centralized mutex across UST tracing
@@ -146,6 +146,9 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 		ret |= __tracepoint_probe_register(name,
 				event->desc->probe_callback,
 				event);
+		if (ret)
+			continue;
+		event->id = chan->free_event_id++;
 		ret |= _ltt_event_metadata_statedump(chan->session, chan,
 				event);
 	}
@@ -492,7 +495,7 @@ void _ltt_event_destroy(struct ltt_event *event)
 int lttng_metadata_printf(struct ltt_session *session,
 			  const char *fmt, ...)
 {
-	struct lib_ring_buffer_ctx ctx;
+	struct lttng_ust_lib_ring_buffer_ctx ctx;
 	struct ltt_channel *chan = session->metadata;
 	char *str = NULL;
 	int ret = 0, waitret;
@@ -998,7 +1001,7 @@ void ltt_transport_unregister(struct ltt_transport *transport)
 	cds_list_del(&transport->node);
 }
 
-void ltt_events_exit(void)
+void lttng_ust_events_exit(void)
 {
 	struct ltt_session *session, *tmpsession;