X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.cpp;h=403ee018579f755819877ce5d25109b7f94f24a4;hb=303ac4ed4037e45da1976c0951358ec19c5364d0;hp=e65c01753e04fec18ccd78a0fac5c6a24b3a316a;hpb=6e11909ebb204e4a0f9651dc6c58f74c8376a094;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.cpp b/src/bin/lttng/utils.cpp
index e65c01753..403ee0185 100644
--- a/src/bin/lttng/utils.cpp
+++ b/src/bin/lttng/utils.cpp
@@ -20,6 +20,7 @@
 #include <ctype.h>
 #include <fnmatch.h>
 #include <inttypes.h>
+#include <iostream>
 #include <limits.h>
 #include <netinet/in.h>
 #include <signal.h>
@@ -668,9 +669,7 @@ template <typename FilterFunctionType>
 lttng::cli::session_list get_sessions(const FilterFunctionType& filter,
 				      bool return_first_match_only = false)
 {
-	lttng::cli::session_list list;
-
-	{
+	lttng::cli::session_list list = []() {
 		int list_ret;
 		struct lttng_session *psessions;
 
@@ -681,8 +680,8 @@ lttng::cli::session_list get_sessions(const FilterFunctionType& filter,
 					static_cast<lttng_error_code>(list_ret));
 		}
 
-		list = lttng::cli::session_list(psessions, list_ret);
-	}
+		return lttng::cli::session_list(psessions, list_ret);
+	}();
 
 	std::size_t write_to = 0;
 	for (std::size_t read_from = 0; read_from < list.size(); ++read_from) {
@@ -713,7 +712,8 @@ 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(
@@ -741,3 +741,53 @@ lttng::cli::session_list lttng::cli::list_sessions(const struct session_spec& sp
 
 	return lttng::cli::session_list();
 }
+
+void print_kernel_tracer_status_error()
+{
+	if (lttng_opt_mi) {
+		return;
+	}
+
+	enum lttng_kernel_tracer_status kernel_tracer_status;
+	const auto ret = lttng_get_kernel_tracer_status(&kernel_tracer_status);
+
+	if (ret < 0) {
+		ERR("Failed to get kernel tracer status: %s", lttng_strerror(ret));
+	} else {
+		switch (kernel_tracer_status) {
+		case LTTNG_KERNEL_TRACER_STATUS_INITIALIZED:
+			return;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_MODULES_UNKNOWN:
+			std::cerr << "\tKernel module loading failed" << std::endl;
+			break;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_MODULES_MISSING:
+			std::cerr << "\tMissing one or more required kernel modules" << std::endl;
+			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;
+			break;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_NEED_ROOT:
+			std::cerr << "\tlttng-sessiond isn't running as root" << std::endl;
+			break;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_NOTIFIER:
+			std::cerr << "\tFailed to setup notifiers" << std::endl;
+			break;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_OPEN_PROC_LTTNG:
+			std::cerr << "\tlttng-sessiond failed to open /proc/lttng" << std::endl;
+			break;
+		case LTTNG_KERNEL_TRACER_STATUS_ERR_VERSION_MISMATCH:
+			std::cerr << "\tVersion mismatch between kernel tracer and kernel tracer ABI"
+				  << std::endl;
+			break;
+		default:
+			std::cerr << lttng::format("\t\tUnknown kernel tracer status (%d)",
+						   static_cast<int>(kernel_tracer_status))
+				  << std::endl;
+			break;
+		}
+
+		std::cerr << "\tConsult lttng-sessiond logs for more information" << std::endl;
+	}
+}