Merge pull request #4918 from pwojcikdev/tcp-channel-queue-optimize

Optimize `tcp_channel_queue`

Author: pwojcikdev

nano/node/transport/tcp_channel.cpp

@@ -222,16 +222,12 @@ nano::transport::tcp_channel_queue::tcp_channel_queue ()
 
 bool nano::transport::tcp_channel_queue::empty () const
 {
-	return std::all_of (queues.begin (), queues.end (), [] (auto const & queue) {
-		return queue.second.empty ();
-	});
+	return total_size == 0;
 }
 
 size_t nano::transport::tcp_channel_queue::size () const
 {
-	return std::accumulate (queues.begin (), queues.end (), size_t{ 0 }, [] (size_t acc, auto const & queue) {
-		return acc + queue.second.size ();
-	});
+	return total_size;
 }
 
 size_t nano::transport::tcp_channel_queue::size (traffic_type type) const
@@ -252,7 +248,8 @@ bool nano::transport::tcp_channel_queue::full (traffic_type type) const
 void nano::transport::tcp_channel_queue::push (traffic_type type, entry_t entry)
 {
 	debug_assert (!full (type)); // Should be checked before calling this function
-	queues.at (type).second.push_back (entry);
+	queues.at (type).second.push_back (std::move (entry));
+	++total_size;
 }
 
 auto nano::transport::tcp_channel_queue::next () -> value_t
@@ -277,6 +274,22 @@ auto nano::transport::tcp_channel_queue::next () -> value_t
 		return false;
 	};
 
+	auto seek_next = [&, this] () {
+		counter = 0;
+		do
+		{
+			if (current != queues.end ())
+			{
+				++current;
+			}
+			if (current == queues.end ())
+			{
+				current = queues.begin ();
+			}
+			release_assert (current != queues.end ());
+		} while (current->second.empty ());
+	};
+
 	if (should_seek ())
 	{
 		seek_next ();
@@ -288,16 +301,16 @@ auto nano::transport::tcp_channel_queue::next () -> value_t
 	auto & queue = current->second;
 
 	++counter;
+	--total_size;
 
 	release_assert (!queue.empty ());
-	auto entry = queue.front ();
+	auto entry = std::move (queue.front ());
 	queue.pop_front ();
-	return { source, entry };
+	return { source, std::move (entry) };
 }
 
 auto nano::transport::tcp_channel_queue::next_batch (size_t max_count) -> batch_t
 {
-	// TODO: Naive implementation, could be optimized
 	std::deque<value_t> result;
 	while (!empty () && result.size () < max_count)
 	{
@@ -316,21 +329,4 @@ size_t nano::transport::tcp_channel_queue::priority (traffic_type type) const
 		default:
 			return 4;
 	}
-}
-
-void nano::transport::tcp_channel_queue::seek_next ()
-{
-	counter = 0;
-	do
-	{
-		if (current != queues.end ())
-		{
-			++current;
-		}
-		if (current == queues.end ())
-		{
-			current = queues.begin ();
-		}
-		release_assert (current != queues.end ());
-	} while (current->second.empty ());
-}
+}

nano/node/transport/tcp_channel.hpp

@@ -33,13 +33,13 @@ class tcp_channel_queue final
 	constexpr static size_t full_size = 4 * max_size;
 
 private:
-	void seek_next ();
 	size_t priority (traffic_type) const;
 
 	using queue_t = std::pair<traffic_type, std::deque<entry_t>>;
 	nano::enum_array<traffic_type, queue_t> queues{};
 	nano::enum_array<traffic_type, queue_t>::iterator current{ queues.end () };
 	size_t counter{ 0 };
+	size_t total_size{ 0 };
 };
 
 class tcp_channel final : public nano::transport::channel, public std::enable_shared_from_this<tcp_channel>