X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=c4b67c6be04d8274048fa1c77a85e67e51eaf02d;hb=88392ad78380766c2361e70ec7b7a7527690e167;hp=71e959d64cf2d9840f885b91128865842cae1639;hpb=fe2d02f428e0113e1ea43e3642658b9674147412;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 71e959d6..c4b67c6b 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -22,6 +22,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
+#include <sys/prctl.h>
 #include "clock.h"
 
 #include <urcu-bp.h>
@@ -43,6 +44,8 @@
 #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
@@ -875,6 +878,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;
@@ -897,13 +901,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,
@@ -1088,6 +1093,7 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 	struct ltt_channel *chan;
 	struct ltt_event *event;
 	int ret = 0;
+	char procname[PROCNAME_LEN] = "";
 
 	if (!CMM_ACCESS_ONCE(session->active))
 		return 0;
@@ -1140,6 +1146,22 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 	if (ret)
 		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';
+	ret = lttng_metadata_printf(session,
+		"env {\n"
+		"	vpid = %d;\n"
+		"	procname = \"%s\";\n"
+		"	domain = %s;\n"
+		"};\n\n",
+		(int) getpid(),
+		procname,
+		"ust"
+		);
+	if (ret)
+		goto end;
+
 	ret = lttng_metadata_printf(session,
 		"clock {\n"
 		"	name = %s;\n",