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

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index b79eea51..e42b6de6 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -13,6 +13,7 @@
 #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>
@@ -20,6 +21,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
+#include <sys/prctl.h>
 #include <lttng/ust-endian.h>
 #include "clock.h"
 
@@ -34,8 +36,6 @@
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "error.h"
-#include "compat.h"
-#include "uuid.h"
 
 #include "tracepoint-internal.h"
 #include "ltt-tracer.h"
@@ -44,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
@@ -295,7 +297,6 @@ 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)
@@ -303,10 +304,7 @@ 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);
-	ret = lttng_ust_uuid_generate(session->uuid);
-	if (ret != 0) {
-		session->uuid[0] = '\0';
-	}
+	uuid_generate(session->uuid);
 	cds_list_add(&session->list, &sessions);
 	return session;
 }
@@ -1091,12 +1089,11 @@ static
 int _ltt_session_metadata_statedump(struct ltt_session *session)
 {
 	unsigned char *uuid_c = session->uuid;
-	char uuid_s[LTTNG_UST_UUID_STR_LEN],
-		clock_uuid_s[LTTNG_UST_UUID_STR_LEN];
+	char uuid_s[37], clock_uuid_s[CLOCK_UUID_LEN];
 	struct ltt_channel *chan;
 	struct ltt_event *event;
 	int ret = 0;
-	char procname[LTTNG_UST_PROCNAME_LEN] = "";
+	char procname[PROCNAME_LEN] = "";
 
 	if (!CMM_ACCESS_ONCE(session->active))
 		return 0;
@@ -1150,8 +1147,8 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		goto end;
 
 	/* ignore error, just use empty string if error. */
-	lttng_ust_getprocname(procname);
-	procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
+	(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"