X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=8052826a245296b0d2d9c310165385a11c5f6ad9;hb=e7248846cfa228ceeb454fa6b0b69bf283cef937;hp=3a2e136e584773051fdef2697e9c6de38ad4d044;hpb=318e4c832cc9a4209dcea885ef2a66cfd16f99d2;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 3a2e136e5..8052826a2 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -67,7 +67,7 @@ static void usage(FILE *ofp)
  */
 static int create_session()
 {
-	int ret;
+	int ret, have_name = 0;
 	char datetime[16];
 	char *session_name, *traces_path = NULL, *alloc_path = NULL;
 	time_t rawtime;
@@ -80,33 +80,37 @@ static int create_session()
 
 	/* Auto session name creation */
 	if (opt_session_name == NULL) {
-		ret = asprintf(&session_name, "auto");
+		ret = asprintf(&session_name, "auto-%s", datetime);
 		if (ret < 0) {
 			perror("asprintf session name");
-			ret = CMD_ERROR;
 			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 = strdup(config_get_default_path());
 		if (alloc_path == NULL) {
-			ERR("Home path not found.\n"
-				"Please specify an output path using -o, --output PATH\n");
+			ERR("Home path not found.\n \
+				 Please specify an output path using -o, --output PATH");
 			ret = CMD_FATAL;
 			goto error;
 		}
 
-		ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+		if (have_name) {
+			ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
 					"/%s-%s", alloc_path, session_name, datetime);
+		} else {
+			ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+					"/%s", alloc_path, session_name);
+		}
 
 		if (ret < 0) {
 			perror("asprintf trace dir name");
-			ret = CMD_ERROR;
 			goto error;
 		}
 	} else {
@@ -115,15 +119,14 @@ static int create_session()
 
 	ret = lttng_create_session(session_name, traces_path);
 	if (ret < 0) {
+		/* Don't set ret so lttng can interpret the sessiond error. */
 		goto error;
 	}
 
 	/* Init lttng session config */
 	ret = config_init(session_name);
 	if (ret < 0) {
-		if (ret == -1) {
-			ret = CMD_ERROR;
-		}
+		ret = CMD_ERROR;
 		goto error;
 	}
 
@@ -133,6 +136,10 @@ static int create_session()
 	ret = CMD_SUCCESS;
 
 error:
+	if (opt_session_name == NULL) {
+		free(session_name);
+	}
+
 	if (alloc_path) {
 		free(alloc_path);
 	}
@@ -159,11 +166,10 @@ int cmd_create(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
+			usage(stdout);
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -177,5 +183,6 @@ int cmd_create(int argc, const char **argv)
 	ret = create_session();
 
 end:
+	poptFreeContext(pc);
 	return ret;
 }