From: Jérémie Galarneau Date: Thu, 20 Apr 2023 16:34:35 +0000 (-0400) Subject: lttng: stop: ensure a cmd_error_code is returned by the command X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=75723cd7cdb098d2ebe80d3cdc801940c0e4e005 lttng: stop: ensure a cmd_error_code is returned by the command Signed-off-by: Jérémie Galarneau Change-Id: Iee537cbda297cee72a1d5ad49738ac347f42d3fd --- diff --git a/src/bin/lttng/commands/stop.cpp b/src/bin/lttng/commands/stop.cpp index 2d3e7cb9e..3bed42f93 100644 --- a/src/bin/lttng/commands/stop.cpp +++ b/src/bin/lttng/commands/stop.cpp @@ -29,15 +29,15 @@ enum { }; namespace { +int opt_no_wait; +struct mi_writer *writer; + #ifdef LTTNG_EMBED_HELP -static const char help_msg[] = +const char help_msg[] = #include ; #endif -int opt_no_wait; -struct mi_writer *writer; - struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ { "help", 'h', POPT_ARG_NONE, nullptr, OPT_HELP, nullptr, nullptr }, @@ -85,21 +85,14 @@ end: /* * Start tracing for all trace of the session. */ -int stop_tracing(const char *session_name) +cmd_error_code stop_tracing(const char *session_name) { int ret; ret = lttng_stop_tracing_no_wait(session_name); if (ret < 0) { - switch (-ret) { - case LTTNG_ERR_TRACE_ALREADY_STOPPED: - WARN("Tracing already stopped for session %s", session_name); - break; - default: - ERR("%s", lttng_strerror(ret)); - break; - } - goto error; + LTTNG_THROW_CTL(fmt::format("Failed to start session `{}`", session_name), + static_cast(-ret)); } if (!opt_no_wait) { @@ -109,7 +102,10 @@ int stop_tracing(const char *session_name) ret = lttng_data_pending(session_name); if (ret < 0) { /* Return the data available call error. */ - goto error; + ERR_FMT("Failed to check pending data for session `{}` ({})", + session_name, + lttng_strerror(ret)); + return CMD_ERROR; } /* @@ -125,34 +121,88 @@ int stop_tracing(const char *session_name) MSG(""); } - ret = CMD_SUCCESS; - print_session_stats(session_name); - MSG("Tracing stopped for session %s", session_name); + MSG("Tracing stopped for session `%s`", session_name); if (lttng_opt_mi) { - ret = mi_print_session(session_name, 0); + if (mi_print_session(session_name, 0)) { + return CMD_ERROR; + } } -error: - return ret; + + return CMD_SUCCESS; } -int stop_tracing(const struct session_spec& spec) +cmd_error_code stop_tracing(const session_spec& spec) noexcept { - int ret = CMD_SUCCESS; + bool had_warning = false; + bool had_error = false; + bool listing_failed = false; + + const auto sessions = [&listing_failed, &spec]() -> session_list { + try { + return list_sessions(spec); + } catch (const lttng::ctl::error& ctl_exception) { + ERR_FMT("Failed to list sessions ({})", + lttng_strerror(-ctl_exception.code())); + listing_failed = true; + return {}; + } + }(); + + if (!listing_failed && sessions.size() == 0 && spec.type == session_spec::type::NAME) { + ERR_FMT("Session `{}` not found", spec.value); + return CMD_ERROR; + } - try { - for (const auto& session : list_sessions(spec)) { - int const sub_ret = stop_tracing(session.name); + if (listing_failed) { + return CMD_FATAL; + } - if (sub_ret != CMD_SUCCESS) { - ret = sub_ret; + for (const auto& session : sessions) { + cmd_error_code sub_ret; + + try { + sub_ret = stop_tracing(session.name); + } catch (const lttng::ctl::error& ctl_exception) { + switch (ctl_exception.code()) { + case LTTNG_ERR_TRACE_ALREADY_STOPPED: + WARN_FMT("Tracing already stopped for session `{}`", session.name); + sub_ret = CMD_SUCCESS; + break; + case LTTNG_ERR_NO_SESSION: + if (spec.type != session_spec::type::NAME) { + /* Session destroyed during command, ignore and carry-on. */ + sub_ret = CMD_SUCCESS; + break; + } else { + sub_ret = CMD_ERROR; + break; + } + case LTTNG_ERR_NO_SESSIOND: + /* Don't keep going on a fatal error. */ + return CMD_FATAL; + default: + /* Generic error. */ + sub_ret = CMD_ERROR; + ERR_FMT("Failed to stop session `{}` ({})", + session.name, + lttng_strerror(-ctl_exception.code())); + break; } } - } catch (lttng::ctl::error& error) { - ret = error.code(); + + /* Keep going, but report the most serious state. */ + had_warning |= sub_ret == CMD_WARNING; + had_error |= sub_ret == CMD_ERROR; } - return ret; + if (had_error) { + return CMD_ERROR; + } else if (had_warning) { + return CMD_WARNING; + } else { + return CMD_SUCCESS; + } } } /* namespace */ @@ -163,7 +213,9 @@ int stop_tracing(const struct session_spec& spec) */ int cmd_stop(int argc, const char **argv) { - int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; + int opt; + cmd_error_code command_ret = CMD_SUCCESS; + bool success = true; static poptContext pc; const char *leftover = nullptr; struct session_spec session_spec = { @@ -177,8 +229,13 @@ int cmd_stop(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: + { + int ret; + SHOW_HELP(); + command_ret = static_cast(ret); goto end; + } case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end; @@ -189,7 +246,7 @@ int cmd_stop(int argc, const char **argv) session_spec.type = session_spec::ALL; break; default: - ret = CMD_UNDEFINED; + command_ret = CMD_UNDEFINED; goto end; } } @@ -198,21 +255,19 @@ int cmd_stop(int argc, const char **argv) if (lttng_opt_mi) { writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); if (!writer) { - ret = -LTTNG_ERR_NOMEM; + command_ret = CMD_ERROR; goto end; } /* Open command element */ - ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_stop); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_writer_command_open(writer, mi_lttng_element_command_stop)) { + command_ret = CMD_ERROR; goto end; } /* Open output element */ - ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_writer_open_element(writer, mi_lttng_element_command_output)) { + command_ret = CMD_ERROR; goto end; } @@ -220,9 +275,8 @@ int cmd_stop(int argc, const char **argv) * Open sessions element * For validation */ - ret = mi_lttng_writer_open_element(writer, config_element_sessions); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_writer_open_element(writer, config_element_sessions)) { + command_ret = CMD_ERROR; goto end; } } @@ -232,36 +286,33 @@ int cmd_stop(int argc, const char **argv) leftover = poptGetArg(pc); if (leftover) { ERR("Unknown argument: %s", leftover); - ret = CMD_ERROR; + command_ret = CMD_ERROR; goto end; } command_ret = stop_tracing(session_spec); if (command_ret) { - success = 0; + success = false; } /* Mi closing */ if (lttng_opt_mi) { /* Close sessions and output element */ - ret = mi_lttng_close_multi_element(writer, 2); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_close_multi_element(writer, 2)) { + command_ret = CMD_ERROR; goto end; } /* Success ? */ - ret = mi_lttng_writer_write_element_bool( - writer, mi_lttng_element_command_success, success); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_writer_write_element_bool( + writer, mi_lttng_element_command_success, success)) { + command_ret = CMD_ERROR; goto end; } /* Command element close */ - ret = mi_lttng_writer_command_close(writer); - if (ret) { - ret = CMD_ERROR; + if (mi_lttng_writer_command_close(writer)) { + command_ret = CMD_ERROR; goto end; } } @@ -269,13 +320,9 @@ int cmd_stop(int argc, const char **argv) end: /* Mi clean-up */ if (writer && mi_lttng_writer_destroy(writer)) { - /* Preserve original error code */ - ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL; + command_ret = CMD_ERROR; } - /* Overwrite ret if an error occurred in stop_tracing() */ - ret = command_ret ? command_ret : ret; - poptFreeContext(pc); - return ret; + return command_ret; }