X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstart.cpp;h=1d787ce653a09730448570089f33df2cb77ac7de;hb=9183bb278808f35193c0d248c537950495c719dc;hp=7082e097dfa5a3dcc9f9f7b384d7bfbbd90b2ea2;hpb=48a4000561343808724f7cb5fa8c131877489ccd;p=lttng-tools.git diff --git a/src/bin/lttng/commands/start.cpp b/src/bin/lttng/commands/start.cpp index 7082e097d..1d787ce65 100644 --- a/src/bin/lttng/commands/start.cpp +++ b/src/bin/lttng/commands/start.cpp @@ -1,11 +1,18 @@ /* - * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 EfficiOS Inc. * * SPDX-License-Identifier: GPL-2.0-only * */ #define _LGPL_SOURCE +#include "../command.hpp" +#include "../utils.hpp" + +#include +#include +#include + #include #include #include @@ -14,34 +21,32 @@ #include #include -#include -#include - -#include "../command.h" - +enum { + OPT_HELP = 1, + OPT_LIST_OPTIONS, + OPT_ENABLE_GLOB, + OPT_ALL, +}; -static char *opt_session_name; -static struct mi_writer *writer; +namespace { +struct mi_writer *writer; #ifdef LTTNG_EMBED_HELP -static const char help_msg[] = +const char help_msg[] = #include -; + ; #endif -enum { - OPT_HELP = 1, - OPT_LIST_OPTIONS, -}; - -static struct poptOption long_options[] = { +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, nullptr, OPT_HELP, nullptr, nullptr }, + { "list-options", 0, POPT_ARG_NONE, nullptr, OPT_LIST_OPTIONS, nullptr, nullptr }, + { "glob", 'g', POPT_ARG_NONE, nullptr, OPT_ENABLE_GLOB, nullptr, nullptr }, + { "all", 'a', POPT_ARG_NONE, nullptr, OPT_ALL, nullptr, nullptr }, + { nullptr, 0, 0, nullptr, 0, nullptr, nullptr } }; -static int mi_print_session(char *session_name, int enabled) +int mi_print_session(const char *session_name, int enabled) { int ret; @@ -52,14 +57,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 +79,13 @@ end: * * Start tracing for all trace of the session. */ -static int start_tracing(void) +int start_tracing(const char *session_name) { int ret; - char *session_name; - if (opt_session_name == NULL) { - session_name = get_session_name(); - if (session_name == NULL) { - ret = CMD_ERROR; - goto error; - } - } else { - session_name = opt_session_name; + if (session_name == nullptr) { + ret = CMD_ERROR; + goto error; } DBG("Starting tracing for session %s", session_name); @@ -103,7 +100,7 @@ static int start_tracing(void) ERR("%s", lttng_strerror(ret)); break; } - goto free_name; + goto error; } ret = CMD_SUCCESS; @@ -113,18 +110,47 @@ static int start_tracing(void) ret = mi_print_session(session_name, 1); if (ret) { ret = CMD_ERROR; - goto free_name; + goto error; } } -free_name: - if (opt_session_name == NULL) { - free(session_name); - } error: return ret; } +int start_tracing(const struct session_spec& spec) +{ + int ret = CMD_SUCCESS; + bool had_warning = false; + + try { + for (const auto& session : list_sessions(spec)) { + const auto sub_ret = start_tracing(session.name); + + switch (sub_ret) { + case CMD_WARNING: + had_warning = true; + /* fall-through. */ + case CMD_SUCCESS: + continue; + default: + ret = sub_ret; + break; + } + } + } catch (const std::exception& e) { + ERR_FMT("{}", e.what()); + return CMD_FATAL; + } + + if (ret == CMD_SUCCESS && had_warning) { + ret = CMD_WARNING; + } + + return ret; +} +} /* namespace */ + /* * cmd_start * @@ -134,9 +160,13 @@ int cmd_start(int argc, const char **argv) { int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; - const char *leftover = NULL; + const char *leftover = nullptr; + struct session_spec session_spec = { + .type = session_spec::NAME, + .value = nullptr, + }; - pc = poptGetContext(NULL, argc, argv, long_options, 0); + pc = poptGetContext(nullptr, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); while ((opt = poptGetNextOpt(pc)) != -1) { @@ -147,13 +177,19 @@ int cmd_start(int argc, const char **argv) case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end; + case OPT_ENABLE_GLOB: + session_spec.type = session_spec::GLOB_PATTERN; + break; + case OPT_ALL: + session_spec.type = session_spec::ALL; + break; default: ret = CMD_UNDEFINED; goto end; } } - opt_session_name = (char*) poptGetArg(pc); + session_spec.value = poptGetArg(pc); leftover = poptGetArg(pc); if (leftover) { @@ -171,16 +207,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 +224,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(session_spec); if (command_ret) { success = 0; } @@ -213,8 +246,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;