X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fcreate.c;h=4083e4195633a609ceba1ee2c28eb55d3bedff2d;hp=4a64d8a76f87bec5f0aea945602765d7b16d90b1;hb=5edd7e09e892604b00ca937c0f1bc887bb5a842c;hpb=58a97671d5fa65f93126798ded9e5306e3555186

diff --git a/lttng/commands/create.c b/lttng/commands/create.c
index 4a64d8a76..4083e4195 100644
--- a/lttng/commands/create.c
+++ b/lttng/commands/create.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,9 +26,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_output_path;
 static char *opt_session_name;
@@ -64,21 +64,28 @@ static void usage(FILE *ofp)
  */
 static int create_session()
 {
-	int ret;
-	char name[NAME_MAX];
+	int ret, have_name = 0;
+	char datetime[16];
 	char *session_name, *traces_path = NULL, *alloc_path = NULL;
 	time_t rawtime;
 	struct tm *timeinfo;
 
+	/* Get date and time for automatic session name/path */
+	time(&rawtime);
+	timeinfo = localtime(&rawtime);
+	strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S", timeinfo);
+
 	/* Auto session name creation */
 	if (opt_session_name == NULL) {
-		time(&rawtime);
-		timeinfo = localtime(&rawtime);
-		strftime(name, sizeof(name), "auto-%Y%m%d-%H%M%S", timeinfo);
-		session_name = name;
+		ret = asprintf(&session_name, "auto-%s", datetime);
+		if (ret < 0) {
+			perror("asprintf session name");
+			goto error;
+		}
 		DBG("Auto session name set to %s", session_name);
 	} else {
 		session_name = opt_session_name;
+		have_name = 1;
 	}
 
 	/* Auto output path */
@@ -91,7 +98,14 @@ static int create_session()
 			goto error;
 		}
 
-		ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME, alloc_path);
+		if (have_name) {
+			ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME
+					"/%s-%s", alloc_path, session_name, datetime);
+		} else {
+			ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME
+					"/%s", alloc_path, session_name);
+		}
+
 		if (ret < 0) {
 			perror("asprintf trace dir name");
 			goto error;
@@ -108,11 +122,14 @@ static int create_session()
 	/* Init lttng session config */
 	ret = config_init(session_name);
 	if (ret < 0) {
+		if (ret == -1) {
+			ret = CMD_ERROR;
+		}
 		goto error;
 	}
 
 	MSG("Session %s created.", session_name);
-	MSG("Traces will be written in %s ", traces_path);
+	MSG("Traces will be written in %s" , traces_path);
 
 	ret = CMD_SUCCESS;