X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-events.c;h=172513f3d0cff3c31ddc7c612ef64a28e7e7ba72;hb=da1fe18f8ed9ba327d14cb1647a6af2f6e11f79c;hp=4c266466953a7ed0706092b42d8a9d87ca2a0659;hpb=c7d9db61d9c4861b6f344af8f1471a42e00739a8;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 4c266466..172513f3 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -291,7 +291,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 	 * notifications.
 	 */
 	event_notifier_group->ops = &transport->ops;
-	event_notifier_group->chan = transport->ops.channel_create(
+	event_notifier_group->chan = transport->ops.priv->channel_create(
 			transport_name, event_notifier_group, NULL,
 			subbuf_size, num_subbuf, switch_timer_interval,
 			read_timer_interval);
@@ -422,7 +422,7 @@ void lttng_event_notifier_group_destroy(
 		event_notifier_group->error_counter = NULL;
 	}
 
-	event_notifier_group->ops->channel_destroy(event_notifier_group->chan);
+	event_notifier_group->ops->priv->channel_destroy(event_notifier_group->chan);
 	module_put(event_notifier_group->transport->owner);
 	list_del(&event_notifier_group->node);
 
@@ -758,7 +758,7 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 	 * headers. Therefore the "chan" information used as input
 	 * should be already accessible.
 	 */
-	chan->chan = transport->ops.channel_create(transport_name,
+	chan->chan = transport->ops.priv->channel_create(transport_name,
 			chan, buf_addr, subbuf_size, num_subbuf,
 			switch_timer_interval, read_timer_interval);
 	if (!chan->chan)
@@ -790,7 +790,7 @@ active:
 static
 void _lttng_channel_destroy(struct lttng_channel *chan)
 {
-	chan->ops->channel_destroy(chan->chan);
+	chan->ops->priv->channel_destroy(chan->chan);
 	module_put(chan->transport->owner);
 	list_del(&chan->list);
 	lttng_kernel_destroy_context(chan->ctx);
@@ -2449,7 +2449,7 @@ static
 int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
 		struct lttng_kernel_abi_filter_bytecode __user *bytecode)
 {
-	struct lttng_bytecode_node *bytecode_node;
+	struct lttng_kernel_bytecode_node *bytecode_node;
 	uint32_t bytecode_len;
 	int ret;
 
@@ -2509,7 +2509,7 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
 static
 void lttng_enabler_destroy(struct lttng_enabler *enabler)
 {
-	struct lttng_bytecode_node *filter_node, *tmp_filter_node;
+	struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node;
 
 	/* Destroy filter bytecode */
 	list_for_each_entry_safe(filter_node, tmp_filter_node,
@@ -2604,7 +2604,7 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		struct lttng_kernel_abi_capture_bytecode __user *bytecode)
 {
-	struct lttng_bytecode_node *bytecode_node;
+	struct lttng_kernel_bytecode_node *bytecode_node;
 	struct lttng_enabler *enabler =
 			lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
 	uint32_t bytecode_len;
@@ -2677,7 +2677,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 	list_for_each_entry(event_recorder_priv, &session->events, node) {
 		struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
 		struct lttng_enabler_ref *enabler_ref;
-		struct lttng_bytecode_runtime *runtime;
+		struct lttng_kernel_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_filter_bytecode = 0;
 		int nr_filters = 0;
 
@@ -2771,7 +2771,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 	list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
 		struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
 		struct lttng_enabler_ref *enabler_ref;
-		struct lttng_bytecode_runtime *runtime;
+		struct lttng_kernel_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_filter_bytecode = 0;
 		int nr_filters = 0, nr_captures = 0;
 
@@ -2879,14 +2879,14 @@ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
 	if (!len)
 		goto end;
 	reserve_len = min_t(size_t,
-			stream->transport->ops.packet_avail_size(chan),
+			stream->transport->ops.priv->packet_avail_size(chan),
 			len);
 	lib_ring_buffer_ctx_init(&ctx, chan, reserve_len,
 			sizeof(char), NULL);
 	/*
 	 * If reservation failed, return an error to the caller.
 	 */
-	ret = stream->transport->ops.event_reserve(&ctx, 0);
+	ret = stream->transport->ops.event_reserve(&ctx);
 	if (ret != 0) {
 		printk(KERN_WARNING "LTTng: Metadata event reservation failed\n");
 		stream->coherent = false;