[ltt-dev] [UST PATCH] Include trace name in output directory name

[nils.carlson@ericsson.com (Nils Carlson)]

Include the name of the trace to the output directory created by
ustd. Yet another part of multi-session support.

Signed-off-by: Nils Carlson <nils.carlson at ericsson.com>
---
 ustd/ustd.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ustd/ustd.c b/ustd/ustd.c
index e75fd9d..3f63457 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -191,9 +191,9 @@ int on_open_buffer(struct libustd_callbacks *data, struct buffer_info *buf)
 		trace_path = USTD_DEFAULT_TRACE_PATH;
 	}
 
-	if (asprintf(&tmp, "%s/%u_%lld", trace_path, buf->pid, buf->pidunique) < 0) {
-		ERR("on_open_buffer : asprintf failed (%s/%u_%lld)",
-		    trace_path, buf->pid, buf->pidunique);
+	if (asprintf(&tmp, "%s/%u_%s_%lld", trace_path, buf->pid, buf->trace, buf->pidunique) < 0) {
+		ERR("on_open_buffer : asprintf failed (%s/%u_%s_%lld)",
+		    trace_path, buf->pid, buf->trace, buf->pidunique);
 		return 1;
 	}
 	result = create_dir_if_needed(tmp);
@@ -204,9 +204,9 @@ int on_open_buffer(struct libustd_callbacks *data, struct buffer_info *buf)
 	}
 	free(tmp);
 
-	if (asprintf(&tmp, "%s/%u_%lld/%s", trace_path, buf->pid, buf->pidunique, buf->name) < 0) {
-		ERR("on_open_buffer : asprintf failed (%s/%u_%lld/%s)",
-		    trace_path, buf->pid, buf->pidunique, buf->name);
+	if (asprintf(&tmp, "%s/%u_%s_%lld/%s", trace_path, buf->pid, buf->trace, buf->pidunique, buf->name) < 0) {
+		ERR("on_open_buffer : asprintf failed (%s/%u_%s_%lld/%s)",
+		    trace_path, buf->pid, buf->trace, buf->pidunique, buf->name);
 		return 1;
 	}
 	result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 00600);
-- 
1.7.1