X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.hpp;h=dfbbc25b28056e71bbbeab4b7d44c6cbb46679d7;hb=6e11909ebb204e4a0f9651dc6c58f74c8376a094;hp=4fa15c38d2f26a689e93d34c8896d7e1b8fb8bdc;hpb=9497e2f771b05ba0cf6ca690f24f73cadc8c6e1d;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index 4fa15c38d..dfbbc25b2 100644
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -9,6 +9,7 @@
 #define _LTTNG_UTILS_H
 
 #include <common/argpar/argpar.h>
+#include <common/container-wrapper.hpp>
 #include <common/dynamic-array.hpp>
 #include <common/make-unique-wrapper.hpp>
 
@@ -25,14 +26,23 @@ extern pid_t sessiond_pid;
 
 struct cmd_struct;
 
+namespace lttng {
+namespace cli {
+
 struct session_spec {
-	enum type {
+	enum class type {
 		NAME,
 		GLOB_PATTERN,
 		ALL,
 	};
 
-	type type;
+	explicit session_spec(type spec_type, const char *name_or_pattern = nullptr) noexcept :
+		type_(spec_type), value(name_or_pattern)
+	{
+	}
+
+	/* Disambiguate type enum from the member for buggy g++ versions. */
+	type type_;
 	const char *value;
 };
 
@@ -41,42 +51,42 @@ struct session_spec {
  */
 class session_list {
 	template <typename ContainerType, typename DereferenceReturnType>
-	class iterator_template : public std::iterator<std::random_access_iterator_tag, std::size_t> {
+	class _iterator : public std::iterator<std::random_access_iterator_tag, std::size_t> {
 	public:
-		explicit iterator_template(ContainerType& list, std::size_t k) : _list(list), _index(k)
+		explicit _iterator(ContainerType& list, std::size_t k) : _list(list), _index(k)
 		{
 		}
 
-		iterator_template& operator++() noexcept
+		_iterator& operator++() noexcept
 		{
 			++_index;
 			return *this;
 		}
 
-		iterator_template& operator--() noexcept
+		_iterator& operator--() noexcept
 		{
 			--_index;
 			return *this;
 		}
 
-		iterator_template& operator++(int) noexcept
+		_iterator& operator++(int) noexcept
 		{
 			_index++;
 			return *this;
 		}
 
-		iterator_template& operator--(int) noexcept
+		_iterator& operator--(int) noexcept
 		{
 			_index--;
 			return *this;
 		}
 
-		bool operator==(iterator_template other) const noexcept
+		bool operator==(_iterator other) const noexcept
 		{
 			return _index == other._index;
 		}
 
-		bool operator!=(iterator_template other) const noexcept
+		bool operator!=(_iterator other) const noexcept
 		{
 			return !(*this == other);
 		}
@@ -91,8 +101,8 @@ class session_list {
 		std::size_t _index;
 	};
 
-	using iterator = iterator_template<session_list, lttng_session>;
-	using const_iterator = iterator_template<const session_list, const lttng_session>;
+	using iterator = _iterator<session_list, lttng_session>;
+	using const_iterator = _iterator<const session_list, const lttng_session>;
 
 public:
 	session_list() : _sessions_count(0), _sessions(nullptr)
@@ -156,10 +166,14 @@ public:
 private:
 	std::size_t _sessions_count;
 	std::unique_ptr<lttng_session,
-			lttng::details::create_unique_class<lttng_session, lttng::free>>
+			lttng::memory::create_deleter_class<lttng_session, lttng::free>::deleter>
 		_sessions;
 };
 
+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);
 void list_commands(struct cmd_struct *commands, FILE *ofp);
@@ -200,6 +214,4 @@ 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);
 
-session_list list_sessions(const struct session_spec& spec);
-
 #endif /* _LTTNG_UTILS_H */