X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=e42b6de64314c914a1c67908f128e628bd2b1ad1;hb=75181c4b1b6e046ae8561c486ced003a83b1a696;hp=c4b67c6be04d8274048fa1c77a85e67e51eaf02d;hpb=8155c5e81ae9d83764056746aee85b3a17d7db38;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index c4b67c6b..e42b6de6 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -10,7 +10,6 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <endian.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
@@ -23,6 +22,7 @@
 #include <inttypes.h>
 #include <time.h>
 #include <sys/prctl.h>
+#include <lttng/ust-endian.h>
 #include "clock.h"
 
 #include <urcu-bp.h>
@@ -493,7 +493,7 @@ int ltt_event_create(struct ltt_channel *chan,
 	struct ltt_event *event;
 	int ret = 0;
 
-	if (chan->used_event_id == -1UL) {
+	if (chan->used_event_id == -1U) {
 		ret = -ENOMEM;
 		goto full;
 	}
@@ -1134,8 +1134,8 @@ int _ltt_session_metadata_statedump(struct ltt_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,
 #if (BYTE_ORDER == BIG_ENDIAN)
 		"be"
@@ -1153,11 +1153,17 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		"env {\n"
 		"	vpid = %d;\n"
 		"	procname = \"%s\";\n"
-		"	domain = %s;\n"
+		"	domain = \"ust\";\n"
+		"	tracer_name = \"lttng-ust\";\n"
+		"	tracer_major = %u;\n"
+		"	tracer_minor = %u;\n"
+		"	tracer_patchlevel = %u;\n"
 		"};\n\n",
 		(int) getpid(),
 		procname,
-		"ust"
+		LTTNG_UST_MAJOR_VERSION,
+		LTTNG_UST_MINOR_VERSION,
+		LTTNG_UST_PATCHLEVEL_VERSION
 		);
 	if (ret)
 		goto end;