X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fload.c;h=002ec4958945ae2bc7caf9eb3c86537243290a84;hp=a0f5e1d65befd4f5990def4bd91acd948c6dd3f5;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=623bc34cc3236f5cddef955fb2ae0e538230bba0

diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index a0f5e1d65..002ec4958 100644
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2014 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * 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.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -30,11 +20,19 @@
 #include "../command.h"
 
 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;
 
 static const char *session_name;
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-load.1.h>
+;
+#endif
+
 enum {
 	OPT_HELP = 1,
 	OPT_ALL,
@@ -46,11 +44,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},
-	{"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}
 };
 
@@ -112,9 +112,33 @@ static int mi_load_print(const char *session_name)
 		}
 	}
 
-	/* Close load element */
-	ret = mi_lttng_writer_close_element(writer);
+	/* Print override elements */
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_load_overrides);
+	if (ret) {
+		goto end;
+	}
+
+	/* Session name override element */
+	if (opt_override_session_name) {
+		ret = mi_lttng_writer_write_element_string(writer,
+				config_element_name, opt_override_session_name);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/* Session url override element */
+	if (opt_override_url) {
+		ret = mi_lttng_writer_write_element_string(writer,
+				mi_lttng_element_load_override_url,
+				opt_override_url);
+		if (ret) {
+			goto end;
+		}
+	}
 
+	/* Close override and load element */
+	ret = mi_lttng_close_multi_element(writer, 2);
 end:
 	return ret;
 }
@@ -129,6 +153,7 @@ int cmd_load(int argc, const char **argv)
 	poptContext pc;
 	struct lttng_load_session_attr *session_attr = NULL;
 	char *input_path = NULL;
+	const char *leftover = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, load_opts, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -172,6 +197,13 @@ int cmd_load(int argc, const char **argv)
 		}
 	}
 
+	leftover = poptGetArg(pc);
+	if (leftover) {
+		ERR("Unknown argument: %s", leftover);
+		ret = CMD_ERROR;
+		goto end;
+	}
+
 	/* Mi check */
 	if (lttng_opt_mi) {
 		writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
@@ -246,6 +278,31 @@ int cmd_load(int argc, const char **argv)
 		goto end;
 	}
 
+	/* Set the overrides attributes if any */
+	if (opt_override_url) {
+		ret = lttng_load_session_attr_set_override_url(session_attr,
+				opt_override_url);
+		if (ret) {
+			ERR("Url override is invalid");
+			goto end;
+		}
+	}
+
+	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));
@@ -257,12 +314,22 @@ int cmd_load(int argc, const char **argv)
 		} else if (session_name) {
 			ret = config_init((char *) session_name);
 			if (ret < 0) {
-				ret = CMD_WARNING;
+				WARN("Could not set %s as the default session",
+						session_name);
 			}
 			MSG("Session %s has been loaded successfully", session_name);
 		} else {
 			MSG("Session has been loaded successfully");
 		}
+
+		if (opt_override_session_name) {
+			MSG("Session name overridden with %s",
+					opt_override_session_name);
+		}
+
+		if (opt_override_url) {
+			MSG("Session output url overridden with %s", opt_override_url);
+		}
 		success = 1;
 		ret = CMD_SUCCESS;
 	}