X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=4a0981b630f14bc1691a3f943f86d51f139d37c7;hb=f194f3b00d042154c35f1f9ec262e25f2cd83b8a;hp=9d5d882794dbe9a555405a3c0f0f84b8714f93b0;hpb=b020e504e028f60a8721d59c3556a7f65bf6b790;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 9d5d8827..4a0981b6 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -10,11 +10,9 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <endian.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
-#include <uuid/uuid.h>
 #include <errno.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
@@ -22,7 +20,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
-#include <sys/prctl.h>
+#include <lttng/ust-endian.h>
 #include "clock.h"
 
 #include <urcu-bp.h>
@@ -36,6 +34,8 @@
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "error.h"
+#include "compat.h"
+#include "lttng-ust-uuid.h"
 
 #include "tracepoint-internal.h"
 #include "ltt-tracer.h"
@@ -44,8 +44,6 @@
 #include "../libringbuffer/shm.h"
 #include "jhash.h"
 
-#define PROCNAME_LEN 17
-
 /*
  * The sessions mutex is the centralized mutex across UST tracing
  * control and probe registration. All operations within this file are
@@ -297,6 +295,7 @@ void synchronize_trace(void)
 struct ltt_session *ltt_session_create(void)
 {
 	struct ltt_session *session;
+	int ret;
 
 	session = zmalloc(sizeof(struct ltt_session));
 	if (!session)
@@ -304,7 +303,10 @@ struct ltt_session *ltt_session_create(void)
 	CDS_INIT_LIST_HEAD(&session->chan);
 	CDS_INIT_LIST_HEAD(&session->events);
 	CDS_INIT_LIST_HEAD(&session->wildcards);
-	uuid_generate(session->uuid);
+	ret = lttng_ust_uuid_generate(session->uuid);
+	if (ret != 0) {
+		session->uuid[0] = '\0';
+	}
 	cds_list_add(&session->list, &sessions);
 	return session;
 }
@@ -878,6 +880,7 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 				  struct ltt_event *event)
 {
 	int ret = 0;
+	int loglevel = TRACE_DEFAULT;
 
 	if (event->metadata_dumped || !CMM_ACCESS_ONCE(session->active))
 		return 0;
@@ -900,13 +903,14 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 	if (ret)
 		goto end;
 
-	if (event->desc->loglevel) {
-		ret = lttng_metadata_printf(session,
-			"	loglevel = %d;\n",
-			*(*event->desc->loglevel));
-		if (ret)
-			goto end;
-	}
+	if (event->desc->loglevel)
+		loglevel = *(*event->desc->loglevel);
+
+	ret = lttng_metadata_printf(session,
+		"	loglevel = %d;\n",
+		loglevel);
+	if (ret)
+		goto end;
 
 	if (event->ctx) {
 		ret = lttng_metadata_printf(session,
@@ -1087,11 +1091,12 @@ static
 int _ltt_session_metadata_statedump(struct ltt_session *session)
 {
 	unsigned char *uuid_c = session->uuid;
-	char uuid_s[37], clock_uuid_s[CLOCK_UUID_LEN];
+	char uuid_s[LTTNG_UST_UUID_STR_LEN],
+		clock_uuid_s[LTTNG_UST_UUID_STR_LEN];
 	struct ltt_channel *chan;
 	struct ltt_event *event;
 	int ret = 0;
-	char procname[PROCNAME_LEN] = "";
+	char procname[LTTNG_UST_PROCNAME_LEN] = "";
 
 	if (!CMM_ACCESS_ONCE(session->active))
 		return 0;
@@ -1132,8 +1137,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"
@@ -1145,17 +1150,23 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		goto end;
 
 	/* ignore error, just use empty string if error. */
-	(void) prctl(PR_GET_NAME, (unsigned long) procname, 0, 0, 0);
-	procname[PROCNAME_LEN - 1] = '\0';
+	lttng_ust_getprocname(procname);
+	procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
 	ret = lttng_metadata_printf(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;