X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstop.cpp;h=9d5533a2175c361be78f159a56628517afed9c13;hb=b9984811575702dea69108d180f5e90098709d13;hp=3bed42f93348169ff956d92ef9eaef94fdab1761;hpb=75723cd7cdb098d2ebe80d3cdc801940c0e4e005;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/stop.cpp b/src/bin/lttng/commands/stop.cpp
index 3bed42f93..9d5533a21 100644
--- a/src/bin/lttng/commands/stop.cpp
+++ b/src/bin/lttng/commands/stop.cpp
@@ -7,6 +7,7 @@
 
 #define _LGPL_SOURCE
 #include "../command.hpp"
+#include "../exception.hpp"
 #include "../utils.hpp"
 
 #include <common/exception.hpp>
@@ -91,7 +92,7 @@ cmd_error_code stop_tracing(const char *session_name)
 
 	ret = lttng_stop_tracing_no_wait(session_name);
 	if (ret < 0) {
-		LTTNG_THROW_CTL(fmt::format("Failed to start session `{}`", session_name),
+		LTTNG_THROW_CTL(lttng::format("Failed to start session `{}`", session_name),
 				static_cast<lttng_error_code>(-ret));
 	}
 
@@ -132,13 +133,13 @@ cmd_error_code stop_tracing(const char *session_name)
 	return CMD_SUCCESS;
 }
 
-cmd_error_code stop_tracing(const session_spec& spec) noexcept
+cmd_error_code stop_tracing(const lttng::cli::session_spec& spec)
 {
 	bool had_warning = false;
 	bool had_error = false;
 	bool listing_failed = false;
 
-	const auto sessions = [&listing_failed, &spec]() -> session_list {
+	const auto sessions = [&listing_failed, &spec]() -> lttng::cli::session_list {
 		try {
 			return list_sessions(spec);
 		} catch (const lttng::ctl::error& ctl_exception) {
@@ -146,10 +147,19 @@ cmd_error_code stop_tracing(const session_spec& spec) noexcept
 				lttng_strerror(-ctl_exception.code()));
 			listing_failed = true;
 			return {};
+		} catch (const lttng::cli::no_default_session_error& cli_exception) {
+			/*
+			 * The retrieval of the default session name already logs
+			 * an error when it fails. There is no value in printing
+			 * anything about this exception.
+			 */
+			listing_failed = true;
+			return {};
 		}
 	}();
 
-	if (!listing_failed && sessions.size() == 0 && spec.type == session_spec::type::NAME) {
+	if (!listing_failed && sessions.size() == 0 &&
+	    spec.type_ == lttng::cli::session_spec::type::NAME) {
 		ERR_FMT("Session `{}` not found", spec.value);
 		return CMD_ERROR;
 	}
@@ -170,7 +180,7 @@ cmd_error_code stop_tracing(const session_spec& spec) noexcept
 				sub_ret = CMD_SUCCESS;
 				break;
 			case LTTNG_ERR_NO_SESSION:
-				if (spec.type != session_spec::type::NAME) {
+				if (spec.type_ != lttng::cli::session_spec::type::NAME) {
 					/* Session destroyed during command, ignore and carry-on. */
 					sub_ret = CMD_SUCCESS;
 					break;
@@ -218,10 +228,7 @@ int cmd_stop(int argc, const char **argv)
 	bool success = true;
 	static poptContext pc;
 	const char *leftover = nullptr;
-	struct session_spec session_spec = {
-		.type = session_spec::NAME,
-		.value = nullptr,
-	};
+	lttng::cli::session_spec session_spec(lttng::cli::session_spec::type::NAME);
 
 	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -240,10 +247,10 @@ int cmd_stop(int argc, const char **argv)
 			list_cmd_options(stdout, long_options);
 			goto end;
 		case OPT_ENABLE_GLOB:
-			session_spec.type = session_spec::GLOB_PATTERN;
+			session_spec.type_ = lttng::cli::session_spec::type::GLOB_PATTERN;
 			break;
 		case OPT_ALL:
-			session_spec.type = session_spec::ALL;
+			session_spec.type_ = lttng::cli::session_spec::type::ALL;
 			break;
 		default:
 			command_ret = CMD_UNDEFINED;