X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fload.c;h=630dccd3b5787e223bdca393a3f3e0e7d28e4579;hp=8fa718ed522fced8bdb942c92f26be0f6b366360;hb=e1f481f68598431b2b9eca264a2ec0c7f5aea686;hpb=c4fb6ceb684b4d52a0ccef987ee89d367e5ebfc8

diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index 8fa718ed5..630dccd3b 100644
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -31,6 +31,7 @@
 
 static char *opt_input_path;
 static char *opt_override_url;
+static char *opt_override_session_name;
 static int opt_force;
 static int opt_load_all;
 
@@ -47,12 +48,13 @@ static struct mi_writer *writer;
 
 static struct poptOption load_opts[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",        'h',  POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"all",         'a',  POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
-	{"input-path",  'i',  POPT_ARG_STRING, &opt_input_path, 0, 0, 0},
-	{"force",       'f',  POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
-	{"override-url",'U',  POPT_ARG_STRING, &opt_override_url, 0, 0, 0},
-	{"list-options",  0,  POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+	{"help",          'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+	{"all",           'a', POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
+	{"input-path",    'i', POPT_ARG_STRING, &opt_input_path, 0, 0, 0},
+	{"force",         'f', POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
+	{"override-url",    0, POPT_ARG_STRING, &opt_override_url, 0, 0, 0},
+	{"override-name",   0, POPT_ARG_STRING, &opt_override_session_name, 0, 0, 0},
+	{"list-options",    0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -258,6 +260,21 @@ int cmd_load(int argc, const char **argv)
 		}
 	}
 
+	if (opt_override_session_name) {
+		if (opt_load_all) {
+			ERR("Options --all and --override-name cannot be used simultaneously");
+			ret = CMD_ERROR;
+			goto end;
+		}
+		ret = lttng_load_session_attr_set_override_session_name(session_attr,
+				opt_override_session_name);
+		if (ret) {
+			ERR("Failed to set session name override");
+			ret = CMD_ERROR;
+			goto end;
+		}
+	}
+
 	ret = lttng_load_session(session_attr);
 	if (ret) {
 		ERR("%s", lttng_strerror(ret));