Clean-up: apply suggested clang-tidy fixes

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

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index 75b91df196d76257565a5c009ae3b654591cfb9d..dc9c23e29923d85503ad0707d82d6c19ce359bb4 100644 (file)
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -14,6 +14,7 @@
 #include <common/make-unique-wrapper.hpp>
 
 #include <lttng/lttng.h>
+#include <lttng/session-internal.hpp>
 
 #include <iterator>
 #include <memory>
@@ -56,7 +57,7 @@ public:
        {
        }
 
-       session_storage(session_storage&& original) :
+       session_storage(session_storage&& original) noexcept :
                _array(std::move(original._array)), _count(original._count)
        {
        }
@@ -66,9 +67,7 @@ public:
        {
        }
 
-       std::unique_ptr<lttng_session[],
-                       lttng::memory::create_deleter_class<lttng_session, lttng::free>::deleter>
-               _array = nullptr;
+       lttng_session_uptr _array = nullptr;
        std::size_t _count = 0;
 };
 
@@ -105,7 +104,7 @@ public:
        {
        }
 
-       session_list(session_list&& original) :
+       session_list(session_list&& original) noexcept :
                lttng::utils::random_access_container_wrapper<details::session_storage,
                                                              lttng_session&,
                                                              details::session_list_operations>(
@@ -139,8 +138,8 @@ lttng::cli::session_list list_sessions(const struct session_spec& spec);
 } /* namespace cli */
 } /* namespace lttng */
 
-char *get_session_name(void);
-char *get_session_name_quiet(void);
+char *get_session_name();
+char *get_session_name_quiet();
 void list_commands(struct cmd_struct *commands, FILE *ofp);
 void list_cmd_options(FILE *ofp, struct poptOption *options);
 void list_cmd_options_argpar(FILE *ofp, const struct argpar_opt_descr *options);
@@ -168,7 +167,7 @@ const char *get_event_type_str(enum lttng_event_type event_type);
 int print_missing_or_multiple_domains(unsigned int domain_count, bool include_agent_domains);
 
 int spawn_relayd(const char *pathname, int port);
-int check_relayd(void);
+int check_relayd();
 void print_session_stats(const char *session_name);
 int get_session_stats_str(const char *session_name, char **str);
 int show_cmd_help(const char *cmd_name, const char *help_msg);
@@ -179,4 +178,10 @@ int print_trace_archive_location(const struct lttng_trace_archive_location *loca
 int validate_exclusion_list(const char *event_name,
                            const struct lttng_dynamic_pointer_array *exclusions);
 
+/*
+ * Ask the sessiond for the more details on the status of the kernel tracer and
+ * print it to stderr.
+ */
+void print_kernel_tracer_status_error();
+
 #endif /* _LTTNG_UTILS_H */