X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=eac261ac7a4b6575405039553a1606970b74cc1d;hp=f60fe619e223e0db9c5686f0a62a5c73362bd02d;hb=d386b2341d96bbeeb1f89071614506c0ddbb9bcc;hpb=ae8564917fa3cb3497ec17951d8ac0ee28de9c81

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index f60fe619e..eac261ac7 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * 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; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -29,6 +28,8 @@
 #include "../command.h"
 #include "../utils.h"
 
+#include <common/sessiond-comm/sessiond-comm.h>
+
 static char *opt_output_path;
 static char *opt_session_name;
 
@@ -67,7 +68,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,41 +81,56 @@ 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());
+		alloc_path = 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;
 		}
+		alloc_path = strdup(alloc_path);
+
+		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);
+		}
 
-		ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s",
-				alloc_path, session_name, datetime);
 		if (ret < 0) {
 			perror("asprintf trace dir name");
-			ret = CMD_ERROR;
 			goto error;
 		}
 	} else {
-		traces_path = opt_output_path;
+		traces_path = expand_full_path(opt_output_path);
+		if (traces_path == NULL) {
+			ret = CMD_ERROR;
+			goto error;
+		}
 	}
 
 	ret = lttng_create_session(session_name, traces_path);
 	if (ret < 0) {
 		/* Don't set ret so lttng can interpret the sessiond error. */
+		switch (-ret) {
+		case LTTCOMM_EXIST_SESS:
+			WARN("Session %s already exists", session_name);
+			break;
+		}
 		goto error;
 	}