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

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index c9a7773f..f48d72b6 100644
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -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;