X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-ring-buffer-event-notifier-client.h;h=9f4382583be17d95cf162bd99c23230b48bc33bb;hb=8a57ec025ffbe56153748fd69b60118862707182;hp=b5e91c550c812d538528c9fe17e428dc02836bfd;hpb=236233f79b01cd3d9f7717650a46bda8c0d7ab85;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h
index b5e91c55..9f438258 100644
--- a/src/lttng-ring-buffer-event-notifier-client.h
+++ b/src/lttng-ring-buffer-event-notifier-client.h
@@ -13,6 +13,7 @@
 #include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_mappings() */
 #include <lttng/abi.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <wrapper/limits.h>
 
@@ -39,7 +40,7 @@ static inline
 size_t record_header_size(const struct lib_ring_buffer_config *config,
 				 struct channel *chan, size_t offset,
 				 size_t *pre_header_padding,
-				 struct lib_ring_buffer_ctx *ctx,
+				 struct lttng_kernel_ring_buffer_ctx *ctx,
 				 void *client_ctx)
 {
 	size_t orig_offset = offset;
@@ -66,7 +67,7 @@ static
 size_t client_record_header_size(const struct lib_ring_buffer_config *config,
 				 struct channel *chan, size_t offset,
 				 size_t *pre_header_padding,
-				 struct lib_ring_buffer_ctx *ctx,
+				 struct lttng_kernel_ring_buffer_ctx *ctx,
 				 void *client_ctx)
 {
 	return record_header_size(config, chan, offset,
@@ -287,7 +288,7 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 
 static
 void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *config,
-			    struct lib_ring_buffer_ctx *ctx)
+			    struct lttng_kernel_ring_buffer_ctx *ctx)
 {
 	uint32_t data_size;
 
@@ -301,49 +302,53 @@ void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *conf
 }
 
 static
-int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx, uint32_t event_id)
+int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
+	struct channel *chan = ctx->client_priv;
 	int ret;
 
+	memset(&ctx->priv, 0, sizeof(ctx->priv));
+	ctx->priv.chan = chan;
+
 	ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
 	if (ret)
 		return ret;
 	lib_ring_buffer_backend_get_pages(&client_config, ctx,
-			&ctx->backend_pages);
+			&ctx->priv.backend_pages);
 
 	lttng_write_event_notifier_header(&client_config, ctx);
 	return 0;
 }
 
 static
-void lttng_event_commit(struct lib_ring_buffer_ctx *ctx)
+void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
 	lib_ring_buffer_commit(&client_config, ctx);
 }
 
 static
-void lttng_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
+void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
 		     size_t len)
 {
 	lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_write_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
 			       const void __user *src, size_t len)
 {
 	lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_memset(struct lttng_kernel_ring_buffer_ctx *ctx,
 		int c, size_t len)
 {
 	lib_ring_buffer_memset(&client_config, ctx, c, len);
 }
 
 static
-void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
 		size_t len)
 {
 	lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
@@ -395,32 +400,35 @@ static struct lttng_transport lttng_relay_transport = {
 	.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING,
 	.owner = THIS_MODULE,
 	.ops = {
-		.channel_create = _channel_create,
-		.channel_destroy = lttng_channel_destroy,
-		.buffer_read_open = lttng_buffer_read_open,
-		.buffer_has_read_closed_stream =
-			lttng_buffer_has_read_closed_stream,
-		.buffer_read_close = lttng_buffer_read_close,
+		.priv = __LTTNG_COMPOUND_LITERAL(struct lttng_kernel_channel_buffer_ops_private, {
+			.pub = &lttng_relay_transport.ops,
+			.channel_create = _channel_create,
+			.channel_destroy = lttng_channel_destroy,
+			.buffer_read_open = lttng_buffer_read_open,
+			.buffer_has_read_closed_stream =
+				lttng_buffer_has_read_closed_stream,
+			.buffer_read_close = lttng_buffer_read_close,
+			.packet_avail_size = lttng_packet_avail_size,
+			.get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue,
+			.get_hp_wait_queue = lttng_get_hp_wait_queue,
+			.is_finalized = lttng_is_finalized,
+			.is_disabled = lttng_is_disabled,
+			.timestamp_begin = client_timestamp_begin,
+			.timestamp_end = client_timestamp_end,
+			.events_discarded = client_events_discarded,
+			.content_size = client_content_size,
+			.packet_size = client_packet_size,
+			.stream_id = client_stream_id,
+			.current_timestamp = client_current_timestamp,
+			.sequence_number = client_sequence_number,
+			.instance_id = client_instance_id,
+		}),
 		.event_reserve = lttng_event_reserve,
 		.event_commit = lttng_event_commit,
 		.event_write_from_user = lttng_event_write_from_user,
 		.event_memset = lttng_event_memset,
 		.event_write = lttng_event_write,
 		.event_strcpy = lttng_event_strcpy,
-		.packet_avail_size = lttng_packet_avail_size,
-		.get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue,
-		.get_hp_wait_queue = lttng_get_hp_wait_queue,
-		.is_finalized = lttng_is_finalized,
-		.is_disabled = lttng_is_disabled,
-		.timestamp_begin = client_timestamp_begin,
-		.timestamp_end = client_timestamp_end,
-		.events_discarded = client_events_discarded,
-		.content_size = client_content_size,
-		.packet_size = client_packet_size,
-		.stream_id = client_stream_id,
-		.current_timestamp = client_current_timestamp,
-		.sequence_number = client_sequence_number,
-		.instance_id = client_instance_id,
 	},
 };