X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-ring-buffer-client.h;h=cec656af5a7c20898c8b8db61226902dcf5edc0a;hb=a8605b844d55fbc00d9b60eee804c9b08fdb9be7;hp=26034e92cf79b864f0f02087f880d240f2f2bfa8;hpb=a67ba386d82d85c6b6ca56c249a13ab5a1f34b08;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index 26034e92..cec656af 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>
 
@@ -98,11 +99,8 @@ 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;
 }
@@ -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);
 }
 
 /*
@@ -149,7 +148,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 	case 1:	/* compact */
 		padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
 		offset += padding;
-		if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
+		if (!(ctx->priv.rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
 			offset += sizeof(uint32_t);	/* id and timestamp */
 		} else {
 			/* Minimum space taken by LTTNG_COMPACT_EVENT_BITS id */
@@ -165,7 +164,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 		padding = lib_ring_buffer_align(offset, lttng_alignof(uint16_t));
 		offset += padding;
 		offset += sizeof(uint16_t);
-		if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
+		if (!(ctx->priv.rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
 			offset += lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
 			offset += sizeof(uint32_t);	/* timestamp */
 		} else {
@@ -207,9 +206,9 @@ void lttng_write_event_header(const struct lib_ring_buffer_config *config,
 			    struct lib_ring_buffer_ctx *ctx,
 			    uint32_t event_id)
 {
-	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
+	struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
 
-	if (unlikely(ctx->rflags))
+	if (unlikely(ctx->priv.rflags))
 		goto slow_path;
 
 	switch (lttng_chan->header_type) {
@@ -224,13 +223,13 @@ void lttng_write_event_header(const struct lib_ring_buffer_config *config,
 		bt_bitfield_write(&id_time, uint32_t,
 				LTTNG_COMPACT_EVENT_BITS,
 				LTTNG_COMPACT_TSC_BITS,
-				ctx->tsc);
+				ctx->priv.tsc);
 		lib_ring_buffer_write(config, ctx, &id_time, sizeof(id_time));
 		break;
 	}
 	case 2:	/* large */
 	{
-		uint32_t timestamp = (uint32_t) ctx->tsc;
+		uint32_t timestamp = (uint32_t) ctx->priv.tsc;
 		uint16_t id = event_id;
 
 		lib_ring_buffer_write(config, ctx, &id, sizeof(id));
@@ -256,11 +255,11 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 				 struct lib_ring_buffer_ctx *ctx,
 				 uint32_t event_id)
 {
-	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
+	struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
 
 	switch (lttng_chan->header_type) {
 	case 1:	/* compact */
-		if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
+		if (!(ctx->priv.rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
 			uint32_t id_time = 0;
 
 			bt_bitfield_write(&id_time, uint32_t,
@@ -269,11 +268,11 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 					event_id);
 			bt_bitfield_write(&id_time, uint32_t,
 					LTTNG_COMPACT_EVENT_BITS,
-					LTTNG_COMPACT_TSC_BITS, ctx->tsc);
+					LTTNG_COMPACT_TSC_BITS, ctx->priv.tsc);
 			lib_ring_buffer_write(config, ctx, &id_time, sizeof(id_time));
 		} else {
 			uint8_t id = 0;
-			uint64_t timestamp = ctx->tsc;
+			uint64_t timestamp = ctx->priv.tsc;
 
 			bt_bitfield_write(&id, uint8_t,
 					0,
@@ -289,8 +288,8 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 		break;
 	case 2:	/* large */
 	{
-		if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
-			uint32_t timestamp = (uint32_t) ctx->tsc;
+		if (!(ctx->priv.rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
+			uint32_t timestamp = (uint32_t) ctx->priv.tsc;
 			uint16_t id = event_id;
 
 			lib_ring_buffer_write(config, ctx, &id, sizeof(id));
@@ -298,7 +297,7 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 			lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
 		} else {
 			uint16_t id = 65535;
-			uint64_t timestamp = ctx->tsc;
+			uint64_t timestamp = ctx->priv.tsc;
 
 			lib_ring_buffer_write(config, ctx, &id, sizeof(id));
 			/* Align extended struct on largest member */
@@ -604,17 +603,21 @@ 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 lib_ring_buffer_ctx *ctx)
 {
-	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
+	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;
-	ctx->cpu = cpu;
+	event_id = event_recorder->priv->id;
+	memset(&ctx->priv, 0, sizeof(ctx->priv));
+	ctx->priv.chan = lttng_chan->chan;
+	ctx->priv.reserve_cpu = cpu;
 
 	/* Compute internal size of context structures. */
 	ctx_get_struct_size(lttng_chan->ctx, &client_ctx.packet_context_len, lttng_chan, ctx);
@@ -622,11 +625,11 @@ int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx,
 	switch (lttng_chan->header_type) {
 	case 1:	/* compact */
 		if (event_id > 30)
-			ctx->rflags |= LTTNG_RFLAG_EXTENDED;
+			ctx->priv.rflags |= LTTNG_RFLAG_EXTENDED;
 		break;
 	case 2:	/* large */
 		if (event_id > 65534)
-			ctx->rflags |= LTTNG_RFLAG_EXTENDED;
+			ctx->priv.rflags |= LTTNG_RFLAG_EXTENDED;
 		break;
 	default:
 		WARN_ON_ONCE(1);
@@ -636,7 +639,7 @@ int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx,
 	if (unlikely(ret))
 		goto put;
 	lib_ring_buffer_backend_get_pages(&client_config, ctx,
-			&ctx->backend_pages);
+			&ctx->priv.backend_pages);
 	lttng_write_event_header(&client_config, ctx, event_id);
 	return 0;
 put: