X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.cpp;h=fde027fe57e465bdd4dd6539f05304958356a766;hb=5b915816f16e7cb3134dd7279abad79b31c2486c;hp=b46893d5eff2c3398329bad262c8b7015e9cc720;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.cpp b/src/bin/lttng/commands/create.cpp
index b46893d5e..fde027fe5 100644
--- a/src/bin/lttng/commands/create.cpp
+++ b/src/bin/lttng/commands/create.cpp
@@ -14,24 +14,24 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <common/compat/time.h>
+#include <common/compat/time.hpp>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
 
-#include <common/mi-lttng.h>
+#include <common/mi-lttng.hpp>
 
-#include "../command.h"
-#include "../utils.h"
+#include "../command.hpp"
+#include "../utils.hpp"
 
-#include <common/defaults.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/uri.h>
-#include <common/utils.h>
+#include <common/defaults.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/uri.hpp>
+#include <common/utils.hpp>
+#include <common/path.hpp>
 #include <lttng/lttng.h>
 
 static char *opt_output_path;
-static char *opt_session_name;
 static char *opt_url;
 static char *opt_ctrl_url;
 static char *opt_data_url;
@@ -129,7 +129,7 @@ end:
 }
 
 static
-struct lttng_session_descriptor *create_session_descriptor(void)
+struct lttng_session_descriptor *create_session_descriptor(const char *session_name)
 {
 	ssize_t uri_count;
 	enum output_type output_type;
@@ -201,17 +201,17 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 		case OUTPUT_UNSPECIFIED:
 		case OUTPUT_LOCAL:
 			descriptor = lttng_session_descriptor_snapshot_local_create(
-					opt_session_name,
+					session_name,
 					output_type == OUTPUT_LOCAL ?
 						local_output_path : NULL);
 			break;
 		case OUTPUT_NONE:
 			descriptor = lttng_session_descriptor_snapshot_create(
-					opt_session_name);
+					session_name);
 			break;
 		case OUTPUT_NETWORK:
 			descriptor = lttng_session_descriptor_snapshot_network_create(
-					opt_session_name, uri_str1, uri_str2);
+					session_name, uri_str1, uri_str2);
 			break;
 		default:
 			abort();
@@ -224,7 +224,7 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 			goto end;
 		}
 		descriptor = lttng_session_descriptor_live_network_create(
-				opt_session_name, uri_str1, uri_str2,
+				session_name, uri_str1, uri_str2,
 				opt_live_timer);
 	} else {
 		/* Regular session. */
@@ -232,17 +232,17 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 		case OUTPUT_UNSPECIFIED:
 		case OUTPUT_LOCAL:
 			descriptor = lttng_session_descriptor_local_create(
-					opt_session_name,
+					session_name,
 					output_type == OUTPUT_LOCAL ?
 						local_output_path : NULL);
 			break;
 		case OUTPUT_NONE:
 			descriptor = lttng_session_descriptor_create(
-					opt_session_name);
+					session_name);
 			break;
 		case OUTPUT_NETWORK:
 			descriptor = lttng_session_descriptor_network_create(
-					opt_session_name, uri_str1, uri_str2);
+					session_name, uri_str1, uri_str2);
 			break;
 		default:
 			abort();
@@ -279,7 +279,7 @@ end:
  *
  *  Returns one of the CMD_* result constants.
  */
-static int create_session(void)
+static int create_session(const char *session_name)
 {
 	int ret, i;
 	char shm_path[LTTNG_PATH_MAX] = {};
@@ -291,8 +291,8 @@ static int create_session(void)
 	const char *created_session_name;
 
 	/* Validate options. */
-	if (opt_session_name) {
-		if (strlen(opt_session_name) > NAME_MAX) {
+	if (session_name) {
+		if (strlen(session_name) > NAME_MAX) {
 			ERR("Session name too long. Length must be lower or equal to %d",
 					NAME_MAX);
 			ret = CMD_ERROR;
@@ -303,11 +303,11 @@ static int create_session(void)
 		 * Both are reserved for the default session name. See bug #449 to
 		 * understand why we need to check both here.
 		 */
-		if ((strncmp(opt_session_name, DEFAULT_SESSION_NAME "-",
+		if ((strncmp(session_name, DEFAULT_SESSION_NAME "-",
 					strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
-				(strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+				(strncmp(session_name, DEFAULT_SESSION_NAME,
 					strlen(DEFAULT_SESSION_NAME)) == 0 &&
-				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
+				strlen(session_name) == strlen(DEFAULT_SESSION_NAME))) {
 			ERR("%s is a reserved keyword for default session(s)",
 					DEFAULT_SESSION_NAME);
 			ret = CMD_ERROR;
@@ -327,7 +327,7 @@ static int create_session(void)
 		goto error;
 	}
 
-	session_descriptor = create_session_descriptor();
+	session_descriptor = create_session_descriptor(session_name);
 	if (!session_descriptor) {
 		ret = CMD_ERROR;
 		goto error;
@@ -373,7 +373,7 @@ static int create_session(void)
 		 * An auto-generated session name already includes the creation
 		 * timestamp.
 		 */
-		if (opt_session_name) {
+		if (session_name) {
 			uint64_t creation_time;
 			struct tm *timeinfo;
 			time_t creation_time_t;
@@ -653,6 +653,7 @@ int cmd_create(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	char *opt_arg = NULL;
+	const char *arg_session_name = NULL;
 	const char *leftover = NULL;
 	static poptContext pc;
 
@@ -672,6 +673,11 @@ int cmd_create(int argc, const char **argv)
 			uint64_t v;
 
 			errno = 0;
+			if (opt_arg) {
+				free(opt_arg);
+				opt_arg = nullptr;
+			}
+
 			opt_arg = poptGetOptArg(pc);
 			if (!opt_arg) {
 				/* Set up default values. */
@@ -754,7 +760,9 @@ int cmd_create(int argc, const char **argv)
 			goto end;
 		}
 	}
-	opt_session_name = (char*) poptGetArg(pc);
+
+	/* Get the optional session name argument. */
+	arg_session_name = poptGetArg(pc);
 
 	leftover = poptGetArg(pc);
 	if (leftover) {
@@ -763,7 +771,7 @@ int cmd_create(int argc, const char **argv)
 		goto end;
 	}
 
-	command_ret = create_session();
+	command_ret = create_session(arg_session_name);
 	if (command_ret) {
 		success = 0;
 	}
@@ -802,6 +810,7 @@ end:
 	/* Overwrite ret if an error occurred in create_session() */
 	ret = command_ret ? command_ret : ret;
 
+	free(opt_arg);
 	poptFreeContext(pc);
 	return ret;
 }