X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-ring-buffer-client.h;h=733a800cca89d94d9fd49e62cdf46c584c27b5da;hb=8070f5c01e8e64ce52912dd4f27021c5d9e3dce2;hp=8ba4a735f10e7bf71f306f7f720df279a7cc9de3;hpb=64c796d8aec1efa5d6f0d5850d2a0095cb7842e3;p=lttng-modules.git

diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 8ba4a735..733a800c 100644
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -55,6 +55,32 @@ static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan)
 	return trace_clock_read64();
 }
 
+static inline
+size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx)
+{
+	int i;
+	size_t orig_offset = offset;
+
+	if (likely(!ctx))
+		return 0;
+	for (i = 0; i < ctx->nr_fields; i++)
+		offset += ctx->fields[i].get_size(offset);
+	return offset - orig_offset;
+}
+
+static inline
+void ctx_record(struct lib_ring_buffer_ctx *bufctx,
+		struct ltt_channel *chan,
+		struct lttng_ctx *ctx)
+{
+	int i;
+
+	if (likely(!ctx))
+		return;
+	for (i = 0; i < ctx->nr_fields; i++)
+		ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+}
+
 /*
  * record_header_size - Calculate the header size and padding necessary.
  * @config: ring buffer instance configuration
@@ -75,6 +101,7 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config,
 				 struct lib_ring_buffer_ctx *ctx)
 {
 	struct ltt_channel *ltt_chan = channel_get_private(chan);
+	struct ltt_event *event = ctx->priv;
 	size_t orig_offset = offset;
 	size_t padding;
 
@@ -113,6 +140,8 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config,
 	default:
 		WARN_ON_ONCE(1);
 	}
+	offset += ctx_get_size(offset, event->ctx);
+	offset += ctx_get_size(offset, ltt_chan->ctx);
 
 	*pre_header_padding = padding;
 	return offset - orig_offset;
@@ -140,6 +169,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 			    uint32_t event_id)
 {
 	struct ltt_channel *ltt_chan = channel_get_private(ctx->chan);
+	struct ltt_event *event = ctx->priv;
 
 	if (unlikely(ctx->rflags))
 		goto slow_path;
@@ -166,6 +196,10 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 	default:
 		WARN_ON_ONCE(1);
 	}
+
+	ctx_record(ctx, ltt_chan, event->ctx);
+	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
+
 	return;
 
 slow_path:
@@ -177,6 +211,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 				 uint32_t event_id)
 {
 	struct ltt_channel *ltt_chan = channel_get_private(ctx->chan);
+	struct ltt_event *event = ctx->priv;
 
 	switch (ltt_chan->header_type) {
 	case 1:	/* compact */
@@ -188,7 +223,6 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 			lib_ring_buffer_write(config, ctx, &id_time, sizeof(id_time));
 		} else {
 			uint8_t id = 0;
-			uint32_t event_id = (uint32_t) event_id;
 			uint64_t timestamp = ctx->tsc;
 
 			bt_bitfield_write(&id, uint8_t, 0, 5, 31);
@@ -224,6 +258,8 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 	default:
 		WARN_ON_ONCE(1);
 	}
+	ctx_record(ctx, ltt_chan, event->ctx);
+	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
 }
 
 static const struct lib_ring_buffer_config client_config;