X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-ring-buffer-client.h;h=9ac2cfe9d348d057e7b30199cb1072766c69bd8d;hb=cefd899fc3de0c29491332929cec445e0d459760;hp=aad7955f8accfcdea845b14858b431adab3cf69c;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index aad7955f..9ac2cfe9 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>
 
@@ -74,7 +75,7 @@ static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan)
 }
 
 static inline
-size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
+size_t ctx_get_aligned_size(size_t offset, struct lttng_kernel_ctx *ctx,
 		size_t ctx_len)
 {
 	size_t orig_offset = offset;
@@ -87,7 +88,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
 }
 
 static inline
-void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
+void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
 		struct lttng_channel *chan, struct lib_ring_buffer_ctx *bufctx)
 {
 	int i;
@@ -110,7 +111,7 @@ void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
 static inline
 void ctx_record(struct lib_ring_buffer_ctx *bufctx,
 		struct lttng_channel *chan,
-		struct lttng_ctx *ctx)
+		struct lttng_kernel_ctx *ctx)
 {
 	int i;
 
@@ -142,8 +143,6 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 				 struct lttng_client_ctx *client_ctx)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(chan);
-	struct lttng_probe_ctx *lttng_probe_ctx = ctx->priv;
-	struct lttng_event *event = lttng_probe_ctx->event;
 	size_t orig_offset = offset;
 	size_t padding;
 
@@ -151,7 +150,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 */
@@ -167,7 +166,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 {
@@ -184,9 +183,6 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 	}
 	offset += ctx_get_aligned_size(offset, lttng_chan->ctx,
 			client_ctx->packet_context_len);
-	offset += ctx_get_aligned_size(offset, event->ctx,
-			client_ctx->event_context_len);
-
 	*pre_header_padding = padding;
 	return offset - orig_offset;
 }
@@ -212,11 +208,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_probe_ctx *lttng_probe_ctx = ctx->priv;
-	struct lttng_event *event = lttng_probe_ctx->event;
+	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) {
@@ -231,13 +225,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));
@@ -250,7 +244,6 @@ void lttng_write_event_header(const struct lib_ring_buffer_config *config,
 	}
 
 	ctx_record(ctx, lttng_chan, lttng_chan->ctx);
-	ctx_record(ctx, lttng_chan, event->ctx);
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
 	return;
@@ -264,13 +257,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_probe_ctx *lttng_probe_ctx = ctx->priv;
-	struct lttng_event *event = lttng_probe_ctx->event;
+	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,
@@ -279,11 +270,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,
@@ -299,8 +290,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));
@@ -308,7 +299,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 */
@@ -323,7 +314,6 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 		WARN_ON_ONCE(1);
 	}
 	ctx_record(ctx, lttng_chan, lttng_chan->ctx);
-	ctx_record(ctx, lttng_chan, event->ctx);
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
@@ -550,11 +540,12 @@ void lttng_channel_destroy(struct channel *chan)
 
 static
 struct channel *_channel_create(const char *name,
-				struct lttng_channel *lttng_chan, void *buf_addr,
+				void *priv, void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval)
 {
+	struct lttng_channel *lttng_chan = priv;
 	struct channel *chan;
 
 	chan = channel_create(&client_config, name, lttng_chan, buf_addr,
@@ -566,7 +557,7 @@ struct channel *_channel_create(const char *name,
 		 * using lttng_relay_transport.ops.
 		 */
 		if (!try_module_get(THIS_MODULE)) {
-			printk(KERN_WARNING "LTT : Can't lock transport module.\n");
+			printk(KERN_WARNING "LTTng: Can't lock transport module.\n");
 			goto error;
 		}
 		chan->backend.priv_ops = &lttng_relay_transport.ops;
@@ -614,32 +605,33 @@ 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_probe_ctx *lttng_probe_ctx = ctx->priv;
-	struct lttng_event *event = lttng_probe_ctx->event;
+	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);
-	ctx_get_struct_size(event->ctx, &client_ctx.event_context_len, lttng_chan, 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);
@@ -649,7 +641,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: