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

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 835d82a4f..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
@@ -27,18 +26,23 @@
 #include <unistd.h>
 
 #include "../command.h"
+#include "../utils.h"
+
+#include <common/sessiond-comm/sessiond-comm.h>
 
 static char *opt_output_path;
 static char *opt_session_name;
 
 enum {
 	OPT_HELP = 1,
+	OPT_LIST_OPTIONS,
 };
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"output",    'o', POPT_ARG_STRING, &opt_output_path, 0, 0, 0},
+	{"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
+	{"output", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
+	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -49,16 +53,18 @@ static void usage(FILE *ofp)
 {
 	fprintf(ofp, "usage: lttng create [options] [NAME]\n");
 	fprintf(ofp, "\n");
+	fprintf(ofp, "  The default NAME is 'auto-yyyymmdd-hhmmss'\n");
 	fprintf(ofp, "  -h, --help           Show this help\n");
+	fprintf(ofp, "      --list-options   Simple listing of options\n");
 	fprintf(ofp, "  -o, --output PATH    Specify output path for traces\n");
 	fprintf(ofp, "\n");
 }
 
 /*
- *  create_session
+ *  Create a tracing session.
+ *  If no name is specified, a default name is generated.
  *
- *  Create a tracing session. If no name specified, a default name will be
- *  generated.
+ *  Returns one of the CMD_* result constants.
  */
 static int create_session()
 {
@@ -88,19 +94,20 @@ static int create_session()
 
 	/* 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 \
+			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/" LTTNG_DEFAULT_TRACE_DIR_NAME
+			ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
 					"/%s-%s", alloc_path, session_name, datetime);
 		} else {
-			ret = asprintf(&traces_path, "%s/" LTTNG_DEFAULT_TRACE_DIR_NAME
+			ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
 					"/%s", alloc_path, session_name);
 		}
 
@@ -109,20 +116,28 @@ static int create_session()
 			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;
 	}
 
 	/* Init lttng session config */
 	ret = config_init(session_name);
 	if (ret < 0) {
-		if (ret == -1) {
-			ret = CMD_ERROR;
-		}
+		ret = CMD_ERROR;
 		goto error;
 	}
 
@@ -132,6 +147,10 @@ static int create_session()
 	ret = CMD_SUCCESS;
 
 error:
+	if (opt_session_name == NULL) {
+		free(session_name);
+	}
+
 	if (alloc_path) {
 		free(alloc_path);
 	}
@@ -143,9 +162,9 @@ error:
 }
 
 /*
- *  cmd_list
+ *  The 'create <options>' first level command
  *
- *  The 'list <options>' first level command
+ *  Returns one of the CMD_* result constants.
  */
 int cmd_create(int argc, const char **argv)
 {
@@ -158,7 +177,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);
 			goto end;
 		default:
 			usage(stderr);
@@ -172,5 +194,6 @@ int cmd_create(int argc, const char **argv)
 	ret = create_session();
 
 end:
+	poptFreeContext(pc);
 	return ret;
 }