X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fload.c;h=002ec4958945ae2bc7caf9eb3c86537243290a84;hp=d58cc07e0daa20853f59dcc411c670b936f70e04;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=38b4ef1b199ddb15db78774a39e9c524ca7e2d24 diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c index d58cc07e0..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 + * Copyright (C) 2014 Jérémie Galarneau * - * 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 @@ -25,15 +15,24 @@ #include #include +#include #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 +; +#endif + enum { OPT_HELP = 1, OPT_ALL, @@ -45,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} }; @@ -111,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; } @@ -123,9 +148,12 @@ end: */ int cmd_load(int argc, const char **argv) { - int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success; + int ret, success; int opt; 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); @@ -134,12 +162,14 @@ int cmd_load(int argc, const char **argv) switch (opt) { case OPT_HELP: SHOW_HELP(); + ret = CMD_SUCCESS; goto end; case OPT_ALL: opt_load_all = 1; break; case OPT_LIST_OPTIONS: list_cmd_options(stdout, load_opts); + ret = CMD_SUCCESS; goto end; case OPT_FORCE: opt_force = 1; @@ -150,6 +180,13 @@ int cmd_load(int argc, const char **argv) } } + ret = lttng_session_daemon_alive(); + if (!ret) { + ERR("No session daemon is available"); + ret = CMD_ERROR; + goto end; + } + if (!opt_load_all) { session_name = poptGetArg(pc); if (session_name) { @@ -160,11 +197,18 @@ 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); if (!writer) { - ret = -LTTNG_ERR_NOMEM; + ret = CMD_ERROR; goto end; } @@ -185,23 +229,109 @@ int cmd_load(int argc, const char **argv) } } - command_ret = config_load_session(opt_input_path, session_name, opt_force, 0); - if (command_ret) { - ERR("%s", lttng_strerror(command_ret)); + /* Prepare load attributes */ + session_attr = lttng_load_session_attr_create(); + if (!session_attr) { + ERR("Failed to create load session attributes"); + ret = CMD_ERROR; + goto end; + } + + /* + * Set the input url + * lttng_load_session_attr_set_input_url only suppports absolute path. + * Use realpath to resolve any relative path. + * */ + if (opt_input_path) { + input_path = realpath(opt_input_path, NULL); + if (!input_path) { + PERROR("Invalid input path"); + ret = CMD_ERROR; + goto end; + } + } else { + input_path = NULL; + } + + ret = lttng_load_session_attr_set_input_url(session_attr, + input_path); + if (ret) { + ERR("Invalid input path"); + ret = CMD_ERROR; + goto end; + } + + /* Set the session name. NULL means all sessions should be loaded */ + ret = lttng_load_session_attr_set_session_name(session_attr, + session_name); + if (ret) { + ERR("Invalid session name"); + ret = CMD_ERROR; + goto end; + } + + /* Set the overwrite attribute */ + ret = lttng_load_session_attr_set_overwrite(session_attr, opt_force); + if (ret) { + ERR("Force argument could not be applied"); + ret = CMD_ERROR; + 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)); success = 0; + ret = CMD_ERROR; } else { if (opt_load_all) { MSG("All sessions have been loaded successfully"); } else if (session_name) { - ret = config_init((char *)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; } /* Mi Printing and closing */ @@ -237,13 +367,11 @@ int cmd_load(int argc, const char **argv) } end: if (writer && mi_lttng_writer_destroy(writer)) { - /* Preserve original error code */ - ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL; + ERR("Failed to destroy mi lttng writer"); } - /* Overwrite ret if the was an error with the load command */ - ret = command_ret ? -command_ret : ret; - + lttng_load_session_attr_destroy(session_attr); + free(input_path); poptFreeContext(pc); return ret; }