From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 8 Nov 2011 18:22:40 +0000 (-0500)
Subject: Fix wrong pathname creation for UST metadata
X-Git-Tag: v2.0-pre15~144
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=f348bb5e108ee280184d408725069cf325be54b9

Fix wrong pathname creation for UST metadata

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c
index 39bfaea15..b2c73ffed 100644
--- a/lttng-sessiond/ust-app.c
+++ b/lttng-sessiond/ust-app.c
@@ -758,8 +758,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess)
 				goto next;
 			}
 
-			ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s",
-					ua_sess->metadata->pathname, "metadata");
+			ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s-%d/metadata",
+					usess->pathname, app->name, app->key.pid);
 			if (ret < 0) {
 				PERROR("asprintf UST create stream");
 				goto next;
@@ -956,8 +956,8 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 			goto error;
 		}
 
-		ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/metadata",
-				ua_sess->metadata->pathname);
+		ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s-%d/metadata",
+				usess->pathname, app->name, app->key.pid);
 		if (ret < 0) {
 			PERROR("asprintf UST create stream");
 			goto error;