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

diff --git a/lttng/commands/create.c b/lttng/commands/create.c
index 941f72355..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,8 +26,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_output_path;
 static char *opt_session_name;
@@ -51,7 +52,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "usage: lttng create [options] [NAME]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "  -h, --help           Show this help\n");
-	fprintf(ofp, "  -o, --output PATH    Specify output path\n");
+	fprintf(ofp, "  -o, --output PATH    Specify output path for traces\n");
 	fprintf(ofp, "\n");
 }
 
@@ -63,58 +64,72 @@ static void usage(FILE *ofp)
  */
 static int create_session()
 {
-	int ret;
-	char name[NAME_MAX];
-	char *session_name, *path = NULL, *alloc_path;
+	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 */
 	if (opt_output_path == NULL) {
-		alloc_path = config_get_default_path();
+		alloc_path = strdup(config_get_default_path());
 		if (alloc_path == NULL) {
+			ERR("Home path not found.\n \
+				 Please specify an output path using -o, --output PATH");
 			ret = CMD_FATAL;
 			goto error;
 		}
-	} else {
-		alloc_path = opt_output_path;
-	}
 
-	path = config_generate_dir_path(alloc_path);
-	if (path == NULL) {
-		ret = CMD_FATAL;
-		goto error;
-	}
+		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);
+		}
 
-	/* Init lttng session config */
-	ret = config_init(path);
-	if (ret < 0) {
-		goto error;
+		if (ret < 0) {
+			perror("asprintf trace dir name");
+			goto error;
+		}
+	} else {
+		traces_path = opt_output_path;
 	}
 
-	ret = config_add_session_name(path, session_name);
+	ret = lttng_create_session(session_name, traces_path);
 	if (ret < 0) {
 		goto error;
 	}
 
-	ret = lttng_create_session(session_name, path);
+	/* 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("Working directory of created session is %s", path);
+	MSG("Traces will be written in %s" , traces_path);
 
 	ret = CMD_SUCCESS;
 
@@ -123,8 +138,8 @@ error:
 		free(alloc_path);
 	}
 
-	if (path) {
-		free(path);
+	if (traces_path) {
+		free(traces_path);
 	}
 	return ret;
 }