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

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index dfbbc25b2..56706af13 100644
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -46,128 +46,93 @@ struct session_spec {
 	const char *value;
 };
 
-/*
- * We don't use a std::vector here because it would make a copy of the C array.
- */
-class session_list {
-	template <typename ContainerType, typename DereferenceReturnType>
-	class _iterator : public std::iterator<std::random_access_iterator_tag, std::size_t> {
-	public:
-		explicit _iterator(ContainerType& list, std::size_t k) : _list(list), _index(k)
-		{
-		}
-
-		_iterator& operator++() noexcept
-		{
-			++_index;
-			return *this;
-		}
-
-		_iterator& operator--() noexcept
-		{
-			--_index;
-			return *this;
-		}
-
-		_iterator& operator++(int) noexcept
-		{
-			_index++;
-			return *this;
-		}
-
-		_iterator& operator--(int) noexcept
-		{
-			_index--;
-			return *this;
-		}
-
-		bool operator==(_iterator other) const noexcept
-		{
-			return _index == other._index;
-		}
-
-		bool operator!=(_iterator other) const noexcept
-		{
-			return !(*this == other);
-		}
-
-		DereferenceReturnType& operator*() const noexcept
-		{
-			return _list[_index];
-		}
-
-	private:
-		ContainerType& _list;
-		std::size_t _index;
-	};
-
-	using iterator = _iterator<session_list, lttng_session>;
-	using const_iterator = _iterator<const session_list, const lttng_session>;
+class session_list;
 
+namespace details {
+class session_storage {
 public:
-	session_list() : _sessions_count(0), _sessions(nullptr)
+	session_storage(lttng_session *raw_sessions, std::size_t sessions_count) :
+		_array(raw_sessions), _count(sessions_count)
 	{
 	}
 
-	session_list(session_list&& original, std::size_t new_count)
+	session_storage(session_storage&& original) :
+		_array(std::move(original._array)), _count(original._count)
 	{
-		_sessions_count = new_count;
-		_sessions = std::move(original._sessions);
 	}
 
-	session_list(struct lttng_session *raw_sessions, std::size_t raw_sessions_count)
+	session_storage(session_storage&& original, std::size_t new_count) :
+		_array(std::move(original._array)), _count(new_count)
 	{
-		_sessions_count = raw_sessions_count;
-		_sessions.reset(raw_sessions);
 	}
 
-	iterator begin() noexcept
-	{
-		return iterator(*this, 0);
-	}
+	std::unique_ptr<lttng_session,
+			lttng::memory::create_deleter_class<lttng_session, lttng::free>::deleter>
+		_array = nullptr;
+	std::size_t _count = 0;
+};
 
-	iterator end() noexcept
+class session_list_operations {
+public:
+	static lttng_session& get(const lttng::cli::details::session_storage& storage,
+				  std::size_t index) noexcept
 	{
-		return iterator(*this, _sessions_count);
+		return storage._array.get()[index];
 	}
 
-	const_iterator begin() const noexcept
+	static std::size_t size(const lttng::cli::details::session_storage& storage)
 	{
-		return const_iterator(*this, 0);
+		return storage._count;
 	}
+};
+} /* namespace details */
+
+/*
+ * We don't use a std::vector here because it would make a copy of the C array.
+ */
+class session_list
+	: public lttng::utils::random_access_container_wrapper<details::session_storage,
+							       lttng_session&,
+							       details::session_list_operations> {
+public:
+	friend details::session_list_operations;
 
-	const_iterator end() const noexcept
+	session_list() :
+		lttng::utils::random_access_container_wrapper<details::session_storage,
+							      lttng_session&,
+							      details::session_list_operations>(
+			{ nullptr, 0 })
 	{
-		return const_iterator(*this, _sessions_count);
 	}
 
-	std::size_t size() const noexcept
+	session_list(session_list&& original) :
+		lttng::utils::random_access_container_wrapper<details::session_storage,
+							      lttng_session&,
+							      details::session_list_operations>(
+			{ std::move(original._container) })
 	{
-		return _sessions_count;
 	}
 
-	void resize(std::size_t new_size) noexcept
+	session_list(session_list&& original, std::size_t new_count) :
+		lttng::utils::random_access_container_wrapper<details::session_storage,
+							      lttng_session&,
+							      details::session_list_operations>(
+			{ std::move(original._container), new_count })
 	{
-		_sessions_count = new_size;
 	}
 
-	lttng_session& operator[](std::size_t index)
+	session_list(lttng_session *raw_sessions, std::size_t raw_sessions_count) :
+		lttng::utils::random_access_container_wrapper<details::session_storage,
+							      lttng_session&,
+							      details::session_list_operations>(
+			{ raw_sessions, raw_sessions_count })
 	{
-		LTTNG_ASSERT(index < _sessions_count);
-		return _sessions.get()[index];
 	}
 
-	const lttng_session& operator[](std::size_t index) const
+	void resize(std::size_t new_size) noexcept
 	{
-		LTTNG_ASSERT(index < _sessions_count);
-		return _sessions.get()[index];
+		_container._count = new_size;
 	}
-
-private:
-	std::size_t _sessions_count;
-	std::unique_ptr<lttng_session,
-			lttng::memory::create_deleter_class<lttng_session, lttng::free>::deleter>
-		_sessions;
 };
 
 lttng::cli::session_list list_sessions(const struct session_spec& spec);