X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-events.c;h=4af0bc6d7bb247e1b3f5f480e63725c5b0d11809;hb=06e646e04714e0e0f7537841107ab0528ef33a52;hp=762395d657330b0aca25959661d8d2ebe587bb53;hpb=891d6b550bf16672b0c3a7b35362f231d6e10fc1;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 762395d6..4af0bc6d 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -232,7 +232,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 static
 void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	struct lttng_ust_shm_handle *handle;
 
 	cds_list_del(&lttng_chan->node);
@@ -254,7 +254,7 @@ void register_event(struct lttng_ust_event_common *event)
 
 	assert(event->priv->registered == 0);
 	desc = event->priv->desc;
-	ret = __tracepoint_probe_register_queue_release(desc->name,
+	ret = lttng_ust_tp_probe_register_queue_release(desc->name,
 			desc->probe_callback,
 			event, desc->signature);
 	WARN_ON_ONCE(ret);
@@ -270,7 +270,7 @@ void unregister_event(struct lttng_ust_event_common *event)
 
 	assert(event->priv->registered == 1);
 	desc = event->priv->desc;
-	ret = __tracepoint_probe_unregister_queue_release(desc->name,
+	ret = lttng_ust_tp_probe_unregister_queue_release(desc->name,
 			desc->probe_callback,
 			event);
 	WARN_ON_ONCE(ret);
@@ -297,7 +297,7 @@ void lttng_session_destroy(struct lttng_session *session)
 		_lttng_event_unregister(event_recorder_priv->parent.pub);
 	}
 	lttng_ust_urcu_synchronize_rcu();	/* Wait for in-flight events to complete */
-	__tracepoint_probe_prune_release_queue();
+	lttng_ust_tp_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
 			&session->priv->enablers_head, node)
 		lttng_event_enabler_destroy(event_enabler);
@@ -1186,7 +1186,7 @@ void lttng_probe_provider_unregister_events(
 	/* Wait for grace period. */
 	lttng_ust_urcu_synchronize_rcu();
 	/* Prune the unregistration queue. */
-	__tracepoint_probe_prune_release_queue();
+	lttng_ust_tp_probe_prune_release_queue();
 
 	/*
 	 * It is now safe to destroy the events and remove them from the event list
@@ -1654,7 +1654,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 	 */
 	cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
-		struct lttng_bytecode_runtime *runtime;
+		struct lttng_ust_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_bytecode = 0;
 
 		/* Enable events */
@@ -1703,7 +1703,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 			lttng_bytecode_filter_sync_state(runtime);
 		}
 	}
-	__tracepoint_probe_prune_release_queue();
+	lttng_ust_tp_probe_prune_release_queue();
 }
 
 /* Support for event notifier is introduced by probe provider major version 2. */
@@ -1872,7 +1872,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 	 */
 	cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
-		struct lttng_bytecode_runtime *runtime;
+		struct lttng_ust_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_bytecode = 0;
 
 		/* Enable event_notifiers */
@@ -1921,7 +1921,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 			lttng_bytecode_capture_sync_state(runtime);
 		}
 	}
-	__tracepoint_probe_prune_release_queue();
+	lttng_ust_tp_probe_prune_release_queue();
 }
 
 /*