Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng / utils.cpp

diff --git a/src/bin/lttng/utils.cpp b/src/bin/lttng/utils.cpp
index e65c01753e04fec18ccd78a0fac5c6a24b3a316a..45fe256a579d092b4a1d92ddd81e26459b315a1e 100644 (file)
--- 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>
@@ -20,6 +21,7 @@
 #include <ctype.h>
 #include <fnmatch.h>
 #include <inttypes.h>
+#include <iostream>
 #include <limits.h>
 #include <netinet/in.h>
 #include <signal.h>
@@ -668,9 +670,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 +681,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,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());
-
-                       if (configured_name) {
-                               const struct lttng::cli::session_spec new_spec(
-                                       lttng::cli::session_spec::type::NAME,
-                                       configured_name.get());
+                               lttng::make_unique_wrapper<char, lttng::memory::free>(
+                                       get_session_name());
 
-                               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(
@@ -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;
+       }
+}