X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-events.c;h=526fb823952219e74cbe1fcebe64da69b7a05865;hb=38d024aef3fc8a0dc8dbecf6fbd4b55dc1e5e49f;hp=73ea08ea843eff4252277bc4a4d70dc8908e51f1;hpb=be066e6c5981a3d8dfda0e2884920c44f983e75e;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index 73ea08ea..526fb823 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -168,7 +168,7 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 		goto nomem;
 	chan->session = session;
 	init_waitqueue_head(&chan->notify_wait);
-	chan->chan = transport->ops.channel_create("[lttng]", session, buf_addr,
+	chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr,
 			subbuf_size, num_subbuf, switch_timer_interval,
 			read_timer_interval);
 	if (!chan->chan)
@@ -202,7 +202,7 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
  * Supports event creation while tracing session is active.
  */
 struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
-				   enum instrum_type itype,
+				   enum lttng_kernel_instrumentation instrumentation,
 				   const struct lttng_event_desc *event_desc,
 				   void *filter)
 {
@@ -226,11 +226,11 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
 	event->desc = event_desc;
 	event->filter = filter;
 	event->id = chan->free_event_id++;
-	event->itype = itype;
+	event->instrumentation = instrumentation;
 	/* Populate ltt_event structure before tracepoint registration. */
 	smp_wmb();
-	switch (itype) {
-	case INSTRUM_TRACEPOINTS:
+	switch (instrumentation) {
+	case LTTNG_KERNEL_TRACEPOINTS:
 		ret = tracepoint_probe_register(name, event_desc->probe_callback,
 						event);
 		if (ret)
@@ -265,8 +265,8 @@ int _ltt_event_unregister(struct ltt_event *event)
 {
 	int ret = -EINVAL;
 
-	switch (event->itype) {
-	case INSTRUM_TRACEPOINTS:
+	switch (event->instrumentation) {
+	case LTTNG_KERNEL_TRACEPOINTS:
 		ret = tracepoint_probe_unregister(event->desc->name,
 						  event->desc->probe_callback,
 						  event);
@@ -491,8 +491,8 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 	 * byte size.
 	 */
 	ret = lttng_metadata_printf(session,
-		"	} aligned(%u);\n"
-		"};\n\n", ltt_get_header_alignment());
+		"	};\n"
+		"};\n\n");
 	if (ret)
 		goto end;
 
@@ -520,7 +520,8 @@ int _ltt_channel_metadata_statedump(struct ltt_session *session,
 	ret = lttng_metadata_printf(session,
 		"stream {\n"
 		"	id = %u;\n"
-		"	event.header := %s;\n",
+		"	event.header := %s;\n"
+		"	packet.context := struct packet_context;\n"
 		"};\n\n",
 		chan->id,
 		chan->header_type == 1 ? "struct event_header_compact" :
@@ -533,6 +534,64 @@ end:
 	return ret;
 }
 
+static
+int _ltt_stream_packet_context_declare(struct ltt_session *session)
+{
+	return lttng_metadata_printf(session,
+		"struct packet_context {\n"
+		"	uint64_t timestamp_begin;\n"
+		"	uint64_t timestamp_end;\n"
+		"	uint32_t events_discarded;\n"
+		"	uint32_t content_size;\n"
+		"	uint32_t packet_size;\n"
+		"	uint32_t cpu_id;\n"
+		"};\n"
+		);
+}
+
+/*
+ * Compact header:
+ * id: range: 0 - 30.
+ * id 31 is reserved to indicate an extended header.
+ *
+ * Large header:
+ * id: range: 0 - 65534.
+ * id 65535 is reserved to indicate an extended header.
+ */
+static
+int _ltt_event_header_declare(struct ltt_session *session)
+{
+	return lttng_metadata_printf(session,
+	"struct event_header_compact {\n"
+	"	enum : uint5_t { compact = 0 ... 30, extended = 31 } id;\n"
+	"	variant <id> {\n"
+	"		struct {\n"
+	"			uint27_t timestamp;\n"
+	"		} compact;\n"
+	"		struct {\n"
+	"			uint32_t id;\n"
+	"			uint64_t timestamp;\n"
+	"		} extended;\n"
+	"	} v;\n"
+	"} align(%u);\n"
+	"\n"
+	"struct event_header_large {\n"
+	"	enum : uint16_t { compact = 0 ... 65534, extended = 65535 } id;\n"
+	"	variant <id> {\n"
+	"		struct {\n"
+	"			uint32_t timestamp;\n"
+	"		} compact;\n"
+	"		struct {\n"
+	"			uint32_t id;\n"
+	"			uint64_t timestamp;\n"
+	"		} extended;\n"
+	"	} v;\n"
+	"} align(%u);\n\n",
+	ltt_alignof(uint32_t) * CHAR_BIT,
+	ltt_alignof(uint16_t) * CHAR_BIT
+	);
+}
+
 /*
  * Output metadata into this session's metadata buffers.
  */
@@ -561,9 +620,12 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		uuid_s[12], uuid_s[13], uuid_s[14], uuid_s[15]);
 
 	ret = lttng_metadata_printf(session,
-		"typealias integer {size = 8; align = %u; signed = false; } := uint8_t;\n"
-		"typealias integer {size = 32; align = %u; signed = false; } := uint32_t;\n"
-		"typealias integer {size = 64; align = %u; signed = false; } := uint64_t;\n"
+		"typealias integer { size = 8; align = %u; signed = false; } := uint8_t;\n"
+		"typealias integer { size = 16; align = %u; signed = false; } := uint16_t;\n"
+		"typealias integer { size = 32; align = %u; signed = false; } := uint32_t;\n"
+		"typealias integer { size = 64; align = %u; signed = false; } := uint64_t;\n"
+		"typealias integer { size = 5; align = 1; signed = false; } := uint5_t;\n"
+		"typealias integer { size = 27; align = 1; signed = false; } := uint27_t;\n"
 		"\n"
 		"trace {\n"
 		"	major = %u;\n"
@@ -574,11 +636,6 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		"		uint32_t magic;\n"
 		"		uint8_t  uuid[16];\n"
 		"		uint32_t stream_id;\n"
-		"		uint64_t timestamp_begin;\n"
-		"		uint64_t timestamp_end;\n"
-		"		uint32_t content_size;\n"
-		"		uint32_t packet_size;\n"
-		"		uint32_t events_lost;\n"
 		"	};\n",
 		"};\n\n",
 		ltt_alignof(uint8_t) * CHAR_BIT,
@@ -596,6 +653,14 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 	if (ret)
 		goto end;
 
+	ret = _ltt_stream_packet_context_declare(session);
+	if (ret)
+		goto end;
+
+	ret = _ltt_event_header_declare(session);
+	if (ret)
+		goto end;
+
 skip_session:
 	list_for_each_entry(chan, &session->chan, list) {
 		ret = _ltt_channel_metadata_statedump(session, chan);