X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.cpp;h=45fe256a579d092b4a1d92ddd81e26459b315a1e;hb=HEAD;hp=26a0cf5edfe770a5ff891f82713a342e88ae34af;hpb=11927a7859022cf38a4153767cc96fda4987070d;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.cpp b/src/bin/lttng/utils.cpp
index 26a0cf5ed..7831ae65a 100644
--- a/src/bin/lttng/utils.cpp
+++ b/src/bin/lttng/utils.cpp
@@ -8,6 +8,7 @@
 #define _LGPL_SOURCE
 #include "command.hpp"
 #include "conf.hpp"
+#include "exception.hpp"
 #include "utils.hpp"
 
 #include <common/defaults.hpp>
@@ -422,7 +423,7 @@ int print_missing_or_multiple_domains(unsigned int domain_count, bool include_ag
 
 	if (domain_count == 0) {
 		ERR("Please specify a domain (--kernel/--userspace%s).",
-		    include_agent_domains ? "/--jul/--log4j/--python" : "");
+		    include_agent_domains ? "/--jul/--log4j/--log4j2/--python" : "");
 		ret = -1;
 	} else if (domain_count > 1) {
 		ERR("Only one domain must be specified.");
@@ -712,17 +713,17 @@ lttng::cli::session_list lttng::cli::list_sessions(const struct session_spec& sp
 	case lttng::cli::session_spec::type::NAME:
 		if (spec.value == nullptr) {
 			const auto configured_name =
-				lttng::make_unique_wrapper<char, lttng::free>(get_session_name());
+				lttng::make_unique_wrapper<char, lttng::memory::free>(
+					get_session_name());
 
-			if (configured_name) {
-				const struct lttng::cli::session_spec new_spec(
-					lttng::cli::session_spec::type::NAME,
-					configured_name.get());
-
-				return list_sessions(new_spec);
+			if (!configured_name) {
+				LTTNG_THROW_CLI_NO_DEFAULT_SESSION();
 			}
 
-			return lttng::cli::session_list();
+			const struct lttng::cli::session_spec new_spec(
+				lttng::cli::session_spec::type::NAME, configured_name.get());
+
+			return list_sessions(new_spec);
 		}
 
 		return get_sessions(
@@ -757,36 +758,36 @@ void print_kernel_tracer_status_error()
 		case LTTNG_KERNEL_TRACER_STATUS_INITIALIZED:
 			return;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_MODULES_UNKNOWN:
-			std::cerr << "\tKernel module loading failed" << std::endl;
+			std::cerr << "\tKernel module loading failed" << '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_MODULES_MISSING:
-			std::cerr << "\tMissing one or more required kernel modules" << std::endl;
+			std::cerr << "\tMissing one or more required kernel modules" << '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_MODULES_SIGNATURE:
 			std::cerr
 				<< "\tKernel module signature error prevented loading of one or more required kernel modules"
-				<< std::endl;
+				<< '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_NEED_ROOT:
-			std::cerr << "\tlttng-sessiond isn't running as root" << std::endl;
+			std::cerr << "\tlttng-sessiond isn't running as root" << '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_NOTIFIER:
-			std::cerr << "\tFailed to setup notifiers" << std::endl;
+			std::cerr << "\tFailed to setup notifiers" << '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_OPEN_PROC_LTTNG:
-			std::cerr << "\tlttng-sessiond failed to open /proc/lttng" << std::endl;
+			std::cerr << "\tlttng-sessiond failed to open /proc/lttng" << '\n';
 			break;
 		case LTTNG_KERNEL_TRACER_STATUS_ERR_VERSION_MISMATCH:
 			std::cerr << "\tVersion mismatch between kernel tracer and kernel tracer ABI"
-				  << std::endl;
+				  << '\n';
 			break;
 		default:
 			std::cerr << lttng::format("\t\tUnknown kernel tracer status (%d)",
 						   static_cast<int>(kernel_tracer_status))
-				  << std::endl;
+				  << '\n';
 			break;
 		}
 
-		std::cerr << "\tConsult lttng-sessiond logs for more information" << std::endl;
+		std::cerr << "\tConsult lttng-sessiond logs for more information" << '\n';
 	}
 }