X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.hpp;h=262775d1d6bf0513e75f83c1ff0a939c68266b7d;hb=42a11b8f4c8d98b33fa1eadcdcda96253e651f0b;hp=c3b442056cc1ecc6d88d518089c3168ea00679e0;hpb=ca938aa52e0d841fc638ecffb4261a80d846831f;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index c3b442056..262775d1d 100644
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -26,13 +26,19 @@ extern pid_t sessiond_pid;
 struct cmd_struct;
 
 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;
 };
 
@@ -40,56 +46,62 @@ struct session_spec {
  * We don't use a std::vector here because it would make a copy of the C array.
  */
 class session_list {
-	class iterator : public std::iterator<std::random_access_iterator_tag, std::size_t> {
+	template <typename ContainerType, typename DereferenceReturnType>
+	class _iterator
+		: public std::iterator<std::random_access_iterator_tag, std::size_t> {
 	public:
-		explicit iterator(session_list& list, std::size_t k) : _list(list), _index(k)
+		explicit _iterator(ContainerType& list, std::size_t k) :
+			_list(list), _index(k)
 		{
 		}
 
-		iterator& operator++() noexcept
+		_iterator& operator++() noexcept
 		{
 			++_index;
 			return *this;
 		}
 
-		iterator& operator--() noexcept
+		_iterator& operator--() noexcept
 		{
 			--_index;
 			return *this;
 		}
 
-		iterator& operator++(int) noexcept
+		_iterator& operator++(int) noexcept
 		{
 			_index++;
 			return *this;
 		}
 
-		iterator& operator--(int) noexcept
+		_iterator& operator--(int) noexcept
 		{
 			_index--;
 			return *this;
 		}
 
-		bool operator==(iterator other) const noexcept
+		bool operator==(_iterator other) const noexcept
 		{
 			return _index == other._index;
 		}
 
-		bool operator!=(iterator other) const noexcept
+		bool operator!=(_iterator other) const noexcept
 		{
 			return !(*this == other);
 		}
 
-		lttng_session& operator*() const noexcept
+		DereferenceReturnType& operator*() const noexcept
 		{
 			return _list[_index];
 		}
 
 	private:
-		session_list& _list;
+		ContainerType& _list;
 		std::size_t _index;
 	};
 
+	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)
 	{
@@ -117,6 +129,16 @@ public:
 		return iterator(*this, _sessions_count);
 	}
 
+	const_iterator begin() const noexcept
+	{
+		return const_iterator(*this, 0);
+	}
+
+	const_iterator end() const noexcept
+	{
+		return const_iterator(*this, _sessions_count);
+	}
+
 	std::size_t size() const noexcept
 	{
 		return _sessions_count;
@@ -142,7 +164,7 @@ 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;
 };