X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-ring-buffer-client.h;h=ac6d5e410acc5b0286e5507c66fde5bd99e6a077;hb=6c8c025bf7552b6073c5c1884e1493badd842f42;hp=ff404368edc6fac5ae6b48fddf0658f53a9bd842;hpb=b1199bd39f4b617b99518b72ceeea644b164b901;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index ff404368..ac6d5e41 100644
--- a/src/lttng-ring-buffer-client.h
+++ b/src/lttng-ring-buffer-client.h
@@ -13,6 +13,7 @@
 #include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_mappings() */
 #include <wrapper/trace-clock.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <ringbuffer/frontend_types.h>
 
@@ -88,7 +89,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_kernel_ctx *ctx,
 
 static inline
 void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
-		struct lttng_channel *chan, struct lib_ring_buffer_ctx *bufctx)
+		struct lttng_channel *chan, struct lttng_kernel_ring_buffer_ctx *bufctx)
 {
 	int i;
 	size_t offset = 0;
@@ -98,17 +99,14 @@ void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
 		return;
 	}
 	for (i = 0; i < ctx->nr_fields; i++) {
-		if (ctx->fields[i].get_size)
-			offset += ctx->fields[i].get_size(offset);
-		if (ctx->fields[i].get_size_arg)
-			offset += ctx->fields[i].get_size_arg(offset,
-					&ctx->fields[i], bufctx, chan);
+		offset += ctx->fields[i].get_size(ctx->fields[i].priv,
+				bufctx->probe_ctx, offset);
 	}
 	*ctx_len = offset;
 }
 
 static inline
-void ctx_record(struct lib_ring_buffer_ctx *bufctx,
+void ctx_record(struct lttng_kernel_ring_buffer_ctx *bufctx,
 		struct lttng_channel *chan,
 		struct lttng_kernel_ctx *ctx)
 {
@@ -118,7 +116,8 @@ void ctx_record(struct lib_ring_buffer_ctx *bufctx,
 		return;
 	lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
 	for (i = 0; i < ctx->nr_fields; i++)
-		ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+		ctx->fields[i].record(ctx->fields[i].priv, bufctx->probe_ctx,
+				bufctx, chan);
 }
 
 /*
@@ -138,7 +137,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,
 				 struct lttng_client_ctx *client_ctx)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(chan);
@@ -190,7 +189,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 
 static
 void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
-				 struct lib_ring_buffer_ctx *ctx,
+				 struct lttng_kernel_ring_buffer_ctx *ctx,
 				 uint32_t event_id);
 
 /*
@@ -204,7 +203,7 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
  */
 static __inline__
 void lttng_write_event_header(const struct lib_ring_buffer_config *config,
-			    struct lib_ring_buffer_ctx *ctx,
+			    struct lttng_kernel_ring_buffer_ctx *ctx,
 			    uint32_t event_id)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
@@ -253,7 +252,7 @@ slow_path:
 
 static
 void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
-				 struct lib_ring_buffer_ctx *ctx,
+				 struct lttng_kernel_ring_buffer_ctx *ctx,
 				 uint32_t event_id)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
@@ -327,7 +326,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,
@@ -355,10 +354,10 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
 			lib_ring_buffer_offset_address(&buf->backend,
 				subbuf_idx * chan->backend.subbuf_size);
 	struct lttng_channel *lttng_chan = channel_get_private(chan);
-	struct lttng_session *session = lttng_chan->session;
+	struct lttng_kernel_session *session = lttng_chan->session;
 
 	header->magic = CTF_MAGIC_NUMBER;
-	memcpy(header->uuid, session->uuid.b, sizeof(session->uuid));
+	memcpy(header->uuid, session->priv->uuid.b, sizeof(session->priv->uuid));
 	header->stream_id = lttng_chan->id;
 	header->stream_instance_id = buf->backend.cpu;
 	header->ctx.timestamp_begin = tsc;
@@ -604,17 +603,18 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 }
 
 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 lttng_kernel_event_recorder *event_recorder = ctx->client_priv;
 	struct lttng_channel *lttng_chan = event_recorder->chan;
 	struct lttng_client_ctx client_ctx;
 	int ret, cpu;
+	uint32_t event_id;
 
 	cpu = lib_ring_buffer_get_cpu(&client_config);
 	if (unlikely(cpu < 0))
 		return -EPERM;
+	event_id = event_recorder->priv->id;
 	memset(&ctx->priv, 0, sizeof(ctx->priv));
 	ctx->priv.chan = lttng_chan->chan;
 	ctx->priv.reserve_cpu = cpu;
@@ -648,42 +648,42 @@ put:
 }
 
 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);
 	lib_ring_buffer_put_cpu(&client_config);
 }
 
 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, '#');
 }
 
 static
-void lttng_event_strcpy_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_strcpy_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
 		const char __user *src, size_t len)
 {
 	lib_ring_buffer_strcpy_from_user_inatomic(&client_config, ctx, src,
@@ -720,12 +720,29 @@ 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 = NULL,	/* Would be racy anyway */
+			.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 = lttng_event_write,
@@ -733,20 +750,6 @@ static struct lttng_transport lttng_relay_transport = {
 		.event_memset = lttng_event_memset,
 		.event_strcpy = lttng_event_strcpy,
 		.event_strcpy_from_user = lttng_event_strcpy_from_user,
-		.packet_avail_size = NULL,	/* Would be racy anyway */
-		.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,
 	},
 };