Merge tcp channels and network keepalive loops

nano/lib/thread_roles.cpp

@@ -118,9 +118,6 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
 		case nano::thread_role::name::network_reachout:
 			thread_role_name_string = "Net reachout";
 			break;
-		case nano::thread_role::name::tcp_keepalive:
-			thread_role_name_string = "Tcp keepalive";
-			break;
 		default:
 			debug_assert (false && "nano::thread_role::get_string unhandled thread role");
 	}

nano/lib/thread_roles.hpp

@@ -48,7 +48,6 @@ enum class name
 	network_cleanup,
 	network_keepalive,
 	network_reachout,
-	tcp_keepalive,
 };
 
 /*

nano/node/network.cpp

@@ -173,6 +173,8 @@ void nano::network::run_keepalive ()
 		flood_keepalive (0.75f);
 		flood_keepalive_self (0.25f);
 
+		tcp_channels.keepalive ();
+
 		lock.lock ();
 	}
 }

nano/node/transport/tcp.cpp

@@ -133,16 +133,11 @@ nano::transport::tcp_channels::tcp_channels (nano::node & node, std::function<vo
 
 nano::transport::tcp_channels::~tcp_channels ()
 {
-	// All threads must be stopped before destruction
-	debug_assert (!keepalive_thread.joinable ());
+	debug_assert (channels.empty ());
 }
 
 void nano::transport::tcp_channels::start ()
 {
-	keepalive_thread = std::thread ([this] () {
-		nano::thread_role::set (nano::thread_role::name::tcp_keepalive);
-		run_keepalive ();
-	});
 }
 
 void nano::transport::tcp_channels::stop ()
@@ -153,11 +148,6 @@ void nano::transport::tcp_channels::stop ()
 	}
 	condition.notify_all ();
 
-	if (keepalive_thread.joinable ())
-	{
-		keepalive_thread.join ();
-	}
-
 	message_manager.stop ();
 
 	// Close all TCP sockets
@@ -176,26 +166,6 @@ void nano::transport::tcp_channels::stop ()
 	channels.clear ();
 }
 
-// TODO: Merge with keepalive in network class
-void nano::transport::tcp_channels::run_keepalive ()
-{
-	nano::unique_lock<nano::mutex> lock{ mutex };
-	while (!stopped)
-	{
-		condition.wait_for (lock, node.network_params.network.keepalive_period);
-		if (stopped)
-		{
-			return;
-		}
-		lock.unlock ();
-
-		node.stats.inc (nano::stat::type::tcp_channels, nano::stat::detail::loop_keepalive);
-		keepalive ();
-
-		lock.lock ();
-	}
-}
-
 bool nano::transport::tcp_channels::insert (std::shared_ptr<nano::transport::channel_tcp> const & channel_a, std::shared_ptr<nano::transport::socket> const & socket_a, std::shared_ptr<nano::transport::tcp_server> const & server_a)
 {
 	auto endpoint (channel_a->get_tcp_endpoint ());

nano/node/transport/tcp.hpp

@@ -158,6 +158,7 @@ namespace transport
 		void list (std::deque<std::shared_ptr<nano::transport::channel>> &, uint8_t = 0, bool = true);
 		void modify (std::shared_ptr<nano::transport::channel_tcp> const &, std::function<void (std::shared_ptr<nano::transport::channel_tcp> const &)>);
 		void update (nano::tcp_endpoint const &);
+		void keepalive ();
 		std::optional<nano::keepalive> sample_keepalive ();
 
 		// Connection start
@@ -167,10 +168,6 @@ namespace transport
 	private: // Dependencies
 		nano::node & node;
 
-	private:
-		void run_keepalive ();
-		void keepalive ();
-
 	public:
 		nano::tcp_message_manager message_manager;
 
@@ -286,7 +283,6 @@ namespace transport
 		std::atomic<bool> stopped{ false };
 		nano::condition_variable condition;
 		mutable nano::mutex mutex;
-		std::thread keepalive_thread;
 
 		std::default_random_engine rng;
 	};