X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstart.cpp;h=e00cac4c6ad6d8395a2a224d7ff40ec3ab979fcc;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=69bd9221fe475cb93668964efc29620688e315e2;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/start.cpp b/src/bin/lttng/commands/start.cpp
index 69bd9221f..e00cac4c6 100644
--- a/src/bin/lttng/commands/start.cpp
+++ b/src/bin/lttng/commands/start.cpp
@@ -6,6 +6,11 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,19 +19,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/mi-lttng.h>
-
-#include "../command.h"
-
-
-static char *opt_session_name;
 static struct mi_writer *writer;
 
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-start.1.h>
-;
+	;
 #endif
 
 enum {
@@ -36,9 +34,9 @@ enum {
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
-	{0, 0, 0, 0, 0, 0, 0}
+	{ "help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0 },
+	{ "list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL },
+	{ 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static int mi_print_session(char *session_name, int enabled)
@@ -52,14 +50,12 @@ static int mi_print_session(char *session_name, int enabled)
 	}
 
 	/* Print session name element */
-	ret = mi_lttng_writer_write_element_string(writer, config_element_name,
-			session_name);
+	ret = mi_lttng_writer_write_element_string(writer, config_element_name, session_name);
 	if (ret) {
 		goto end;
 	}
 
-	ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled,
-			enabled);
+	ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled, enabled);
 	if (ret) {
 		goto end;
 	}
@@ -76,19 +72,23 @@ end:
  *
  *  Start tracing for all trace of the session.
  */
-static int start_tracing(void)
+static int start_tracing(const char *arg_session_name)
 {
 	int ret;
 	char *session_name;
 
-	if (opt_session_name == NULL) {
+	if (arg_session_name == NULL) {
 		session_name = get_session_name();
+	} else {
+		session_name = strdup(arg_session_name);
 		if (session_name == NULL) {
-			ret = CMD_ERROR;
-			goto error;
+			PERROR("Failed to copy session name");
 		}
-	} else {
-		session_name = opt_session_name;
+	}
+
+	if (session_name == NULL) {
+		ret = CMD_ERROR;
+		goto error;
 	}
 
 	DBG("Starting tracing for session %s", session_name);
@@ -118,9 +118,7 @@ static int start_tracing(void)
 	}
 
 free_name:
-	if (opt_session_name == NULL) {
-		free(session_name);
-	}
+	free(session_name);
 error:
 	return ret;
 }
@@ -134,6 +132,7 @@ int cmd_start(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	static poptContext pc;
+	const char *arg_session_name = NULL;
 	const char *leftover = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
@@ -153,7 +152,7 @@ int cmd_start(int argc, const char **argv)
 		}
 	}
 
-	opt_session_name = (char*) poptGetArg(pc);
+	arg_session_name = poptGetArg(pc);
 
 	leftover = poptGetArg(pc);
 	if (leftover) {
@@ -171,16 +170,14 @@ int cmd_start(int argc, const char **argv)
 		}
 
 		/* Open command element */
-		ret = mi_lttng_writer_command_open(writer,
-				mi_lttng_element_command_start);
+		ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_start);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
 		}
 
 		/* Open output element */
-		ret = mi_lttng_writer_open_element(writer,
-				mi_lttng_element_command_output);
+		ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
@@ -190,15 +187,14 @@ int cmd_start(int argc, const char **argv)
 		 * Open sessions element
 		 * For validation purpose
 		 */
-		ret = mi_lttng_writer_open_element(writer,
-			config_element_sessions);
+		ret = mi_lttng_writer_open_element(writer, config_element_sessions);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
 		}
 	}
 
-	command_ret = start_tracing();
+	command_ret = start_tracing(arg_session_name);
 	if (command_ret) {
 		success = 0;
 	}
@@ -213,8 +209,8 @@ int cmd_start(int argc, const char **argv)
 		}
 
 		/* Success ? */
-		ret = mi_lttng_writer_write_element_bool(writer,
-				mi_lttng_element_command_success, success);
+		ret = mi_lttng_writer_write_element_bool(
+			writer, mi_lttng_element_command_success, success);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;