X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=1ebe590ad279915e8e3e7ba05784e0333eb9064f;hb=90e7d72ff2b93752b8c81c49e9251a83b01703c6;hp=1d02a1f0a86021d50c3ad53e5581181b96bc3563;hpb=37d03ff782ab6774cb972549854ebc3f95e7d677;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 1d02a1f0a..1ebe590ad 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <ctype.h>
 #include <popt.h>
@@ -47,7 +48,6 @@ static int opt_no_consumer;
 static int opt_no_output;
 static int opt_snapshot;
 static unsigned int opt_live_timer;
-static int opt_disable_consumer;
 
 enum {
 	OPT_HELP = 1,
@@ -67,7 +67,6 @@ static struct poptOption long_options[] = {
 	{"data-url",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
 	{"no-output",       0, POPT_ARG_VAL, &opt_no_output, 1, 0, 0},
 	{"no-consumer",     0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0},
-	{"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
 	{"snapshot",        0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0},
 	{"live",            0, POPT_ARG_INT | POPT_ARGFLAG_OPTIONAL, 0, OPT_LIVE_TIMER, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
@@ -115,7 +114,6 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "  -U, --set-url=URL    Set URL destination of the trace data.\n");
 	fprintf(ofp, "                       It is persistent for the session lifetime.\n");
 	fprintf(ofp, "                       This will set both data and control URL.\n");
-	fprintf(ofp, "                       You can change it with the enable-consumer cmd\n");
 	fprintf(ofp, "  -C, --ctrl-url=URL   Set control path URL. (Must use -D also)\n");
 	fprintf(ofp, "  -D, --data-url=URL   Set data path URL. (Must use -C also)\n");
 	fprintf(ofp, "\n");
@@ -152,11 +150,9 @@ static void usage(FILE *ofp)
 }
 
 /*
- * Retrieve the created session and
- * mi output it of the created session based on provided argument
+ * Retrieve the created session and mi output it based on provided argument
  * This is currently a summary of what was pretty printed and is subject to
  * enhancements.
- * str_url is a placement string for output  url (snapshot or regular trace)
  */
 static int mi_created_session(const char *session_name)
 {
@@ -381,16 +377,22 @@ static int create_session(void)
 		 */
 		url = NULL;
 	} else if (!opt_no_output) {
+		char *tmp_path;
+
 		/* Auto output path */
-		alloc_path = utils_get_home_dir();
-		if (alloc_path == NULL) {
+		tmp_path = utils_get_home_dir();
+		if (tmp_path == NULL) {
 			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);
-
+		alloc_path = strdup(tmp_path);
+		if (!alloc_path) {
+			PERROR("allocating alloc_path");
+			ret = CMD_FATAL;
+			goto error;
+		}
 		ret = asprintf(&alloc_url,
 				"file://%s/" DEFAULT_TRACE_DIR_NAME "/%s",
 				alloc_path, session_name_date);
@@ -587,14 +589,7 @@ int cmd_create(int argc, const char **argv)
 		goto end;
 	}
 
-	if (opt_disable_consumer) {
-		MSG("The option --disable-consumer is obsolete.");
-		ret = CMD_WARNING;
-		goto end;
-	}
-
-
-	/* MI initilisation */
+	/* MI initialization */
 	if (lttng_opt_mi) {
 		writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
 		if (!writer) {
@@ -656,7 +651,7 @@ end:
 		ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
 	}
 
-	/* Overwrite ret if an error occured in create_session() */
+	/* Overwrite ret if an error occurred in create_session() */
 	ret = command_ret ? command_ret : ret;
 
 	poptFreeContext(pc);