ASYNC SPAWN

nano/lib/async.hpp

@@ -52,17 +52,26 @@ class cancellation
 		return signal->slot ();
 	}
 
-private:
 	nano::async::strand & strand;
+
+private:
 	std::unique_ptr<asio::cancellation_signal> signal; // Wrap the signal in a unique_ptr to enable moving
 
 	bool slotted{ false };
 };
 
+auto spawn (nano::async::strand & strand, nano::async::cancellation & cancellation, auto && func)
+{
+	debug_assert (cancellation.strand == strand);
+
+	auto fut = asio::co_spawn (strand, std::forward<decltype (func)> (func), asio::bind_cancellation_slot (cancellation.slot (), asio::use_future));
+	return fut;
+}
+
 auto spawn (nano::async::strand & strand, auto && func)
 {
 	nano::async::cancellation cancellation{ strand };
-	auto fut = asio::co_spawn (strand, std::forward<decltype (func)> (func), asio::bind_cancellation_slot (cancellation.slot (), asio::use_future));
+	auto fut = spawn (strand, cancellation, std::forward<decltype (func)> (func));
 	return std::make_pair (std::move (fut), std::move (cancellation));
 }
 }

nano/node/transport/tcp_listener.cpp

@@ -67,8 +67,8 @@ void nano::transport::tcp_listener::start ()
 		throw;
 	}
 
-	future = asio::co_spawn (
-	strand, [this] () -> asio::awaitable<void> {
+	future = nano::async::spawn (
+	strand, cancellation, [this] () -> asio::awaitable<void> {
 		co_await nano::async::setup_this_coro ();
 		try
 		{
@@ -88,7 +88,7 @@ void nano::transport::tcp_listener::start ()
 		{
 			logger.critical (nano::log::type::tcp_listener, "Unknown error");
 			release_assert (false); // Unexpected error
-		} }, asio::bind_cancellation_slot (cancellation.slot (), asio::use_future));
+		} });
 
 	cleanup_thread = std::thread ([this] {
 		nano::thread_role::set (nano::thread_role::name::tcp_listener);
@@ -234,12 +234,9 @@ bool nano::transport::tcp_listener::connect (asio::ip::address ip, uint16_t port
 	stats.inc (nano::stat::type::tcp_listener, nano::stat::detail::connect_initiate, nano::stat::dir::out);
 	logger.debug (nano::log::type::tcp_listener, "Initiating outgoing connection to: {}", fmt::streamed (endpoint));
 
-	// auto future = asio::co_spawn (node.io_ctx, connect_impl (endpoint), asio::use_future);
 	auto [future, cancellation] = nano::async::spawn (strand, connect_impl (endpoint));
 
-	attempt att{ endpoint, std::move (future), std::move (cancellation) };
-
-	// attempts.emplace ();
+	attempts.emplace_back (attempt{ endpoint, std::move (future), std::move (cancellation) });
 
 	return true; // Attempt started
 }