X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-events.c;h=fba5a8eb8fbcd304cd02d2c700d5ebdc47ac83b2;hb=ec01ec933b457ad54e399c38cf768a699e32ddbb;hp=a01d0af849e69a8ef3a4dc7cb33fa69ae167c981;hpb=99dc95978f22d31ac51c03e2df5bbe9e7876ec6a;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index a01d0af8..fba5a8eb 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -113,6 +113,11 @@ int lttng_session_enable(struct lttng_session *session)
 	ACCESS_ONCE(session->active) = 1;
 	ACCESS_ONCE(session->been_active) = 1;
 	ret = _lttng_session_metadata_statedump(session);
+	if (ret) {
+		ACCESS_ONCE(session->active) = 0;
+		goto end;
+	}
+	ret = lttng_statedump_start(session);
 	if (ret)
 		ACCESS_ONCE(session->active) = 0;
 end:
@@ -227,9 +232,9 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 	 * headers. Therefore the "chan" information used as input
 	 * should be already accessible.
 	 */
-	chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr,
-			subbuf_size, num_subbuf, switch_timer_interval,
-			read_timer_interval);
+	chan->chan = transport->ops.channel_create(transport_name,
+			chan, buf_addr, subbuf_size, num_subbuf,
+			switch_timer_interval, read_timer_interval);
 	if (!chan->chan)
 		goto create_error;
 	chan->enabled = 1;
@@ -927,8 +932,8 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 		lttng_alignof(uint16_t) * CHAR_BIT,
 		lttng_alignof(uint32_t) * CHAR_BIT,
 		lttng_alignof(uint64_t) * CHAR_BIT,
-		CTF_VERSION_MAJOR,
-		CTF_VERSION_MINOR,
+		CTF_SPEC_MAJOR,
+		CTF_SPEC_MINOR,
 		uuid_s,
 #ifdef __BIG_ENDIAN
 		"be"
@@ -941,15 +946,21 @@ int _lttng_session_metadata_statedump(struct lttng_session *session)
 
 	ret = lttng_metadata_printf(session,
 		"env {\n"
-		"	domain = \"%s\";\n"
+		"	domain = \"kernel\";\n"
 		"	sysname = \"%s\";\n"
-		"	release = \"%s\";\n"
-		"	version = \"%s\";\n"
+		"	kernel_release = \"%s\";\n"
+		"	kernel_version = \"%s\";\n"
+		"	tracer_name = \"lttng-modules\";\n"
+		"	tracer_major = %d;\n"
+		"	tracer_minor = %d;\n"
+		"	tracer_patchlevel = %d;\n"
 		"};\n\n",
-		"kernel",
 		utsname()->sysname,
 		utsname()->release,
-		utsname()->version
+		utsname()->version,
+		LTTNG_MODULES_MAJOR_VERSION,
+		LTTNG_MODULES_MINOR_VERSION,
+		LTTNG_MODULES_PATCHLEVEL_VERSION
 		);
 	if (ret)
 		goto end;