X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-events.c;h=d806f0431aec7225cf7467fdf646e948cdc3204a;hb=b653ddc1c1b44ad674265ebb749cfebd97be350e;hp=6196fc6a59fbbd89a8336f4526e62c5060109875;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 6196fc6a..d806f043 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -33,12 +33,12 @@
 #include <lttng/ust-events.h>
 
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-ctl.h>
 #include <ust-comm.h>
 #include <ust-fd.h>
-#include <lttng/ust-dynamic-type.h>
-#include <lttng/ust-context-provider.h>
+#include <ust-dynamic-type.h>
+#include <ust-context-provider.h>
 #include "error.h"
 #include "compat.h"
 #include "lttng-ust-uuid.h"
@@ -65,7 +65,7 @@
 static CDS_LIST_HEAD(sessions);
 static CDS_LIST_HEAD(event_notifier_groups);
 
-struct cds_list_head *_lttng_get_sessions(void)
+struct cds_list_head *lttng_get_sessions(void)
 {
 	return &sessions;
 }
@@ -331,7 +331,7 @@ void lttng_session_destroy(struct lttng_session *session)
 	cds_list_for_each_entry(event, &session->events_head, node) {
 		_lttng_event_unregister(event);
 	}
-	lttng_ust_synchronize_trace();	/* Wait for in-flight events to complete */
+	lttng_ust_urcu_synchronize_rcu();	/* Wait for in-flight events to complete */
 	__tracepoint_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
 			&session->enablers_head, node)
@@ -364,7 +364,7 @@ void lttng_event_notifier_group_destroy(
 			&event_notifier_group->event_notifiers_head, node)
 		_lttng_event_notifier_unregister(notifier);
 
-	lttng_ust_synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 
 	cds_list_for_each_entry_safe(notifier_enabler, tmpnotifier_enabler,
 			&event_notifier_group->enablers_head, node)
@@ -1083,7 +1083,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 	unsigned int i;
 
 	/* Get handle on list of sessions. */
-	sessionsp = _lttng_get_sessions();
+	sessionsp = lttng_get_sessions();
 
 	/*
 	 * Iterate over all events in the probe provider descriptions and
@@ -1201,7 +1201,7 @@ void lttng_probe_provider_unregister_events(
 		_lttng_event_notifier_unregister);
 
 	/* Wait for grace period. */
-	lttng_ust_synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 	/* Prune the unregistration queue. */
 	__tracepoint_probe_prune_release_queue();