RPC SHARED IO_CTX

nano/nano_node/daemon.cpp

@@ -176,7 +176,7 @@ void nano::daemon::run (std::filesystem::path const & data_path, nano::node_flag
 								}
 							});
 						});
-						rpc = nano::get_rpc (*io_ctx, rpc_config, *rpc_handler);
+						rpc = nano::get_rpc (io_ctx, rpc_config, *rpc_handler);
 						rpc->start ();
 					}
 					else

nano/nano_rpc/entry.cpp

@@ -55,7 +55,7 @@ void run (std::filesystem::path const & data_path, std::vector<std::string> cons
 		try
 		{
 			nano::ipc_rpc_processor ipc_rpc_processor (*io_ctx, rpc_config);
-			auto rpc = nano::get_rpc (*io_ctx, rpc_config, ipc_rpc_processor);
+			auto rpc = nano::get_rpc (io_ctx, rpc_config, ipc_rpc_processor);
 			rpc->start ();
 
 			debug_assert (!nano::signal_handler_impl);

nano/nano_wallet/entry.cpp

@@ -192,7 +192,7 @@ int run_wallet (QApplication & application, int argc, char * const * argv, std::
 					}
 					rpc_config.tls_config = tls_config;
 					rpc_handler = std::make_unique<nano::inprocess_rpc_handler> (*node, ipc, config.rpc);
-					rpc = nano::get_rpc (*io_ctx, rpc_config, *rpc_handler);
+					rpc = nano::get_rpc (io_ctx, rpc_config, *rpc_handler);
 					rpc->start ();
 				}
 				else

nano/rpc/rpc.cpp

@@ -12,10 +12,11 @@
 #include <nano/rpc/rpc_secure.hpp>
 #endif
 
-nano::rpc::rpc (boost::asio::io_context & io_ctx_a, nano::rpc_config config_a, nano::rpc_handler_interface & rpc_handler_interface_a) :
+nano::rpc::rpc (std::shared_ptr<boost::asio::io_context> io_ctx_a, nano::rpc_config config_a, nano::rpc_handler_interface & rpc_handler_interface_a) :
 	config (std::move (config_a)),
-	acceptor (io_ctx_a),
-	io_ctx (io_ctx_a),
+	io_ctx_shared (io_ctx_a),
+	io_ctx (*io_ctx_shared),
+	acceptor (io_ctx),
 	rpc_handler_interface (rpc_handler_interface_a)
 {
 	rpc_handler_interface.rpc_instance (*this);
@@ -78,7 +79,7 @@ void nano::rpc::stop ()
 	acceptor.close ();
 }
 
-std::unique_ptr<nano::rpc> nano::get_rpc (boost::asio::io_context & io_ctx_a, nano::rpc_config const & config_a, nano::rpc_handler_interface & rpc_handler_interface_a)
+std::unique_ptr<nano::rpc> nano::get_rpc (std::shared_ptr<boost::asio::io_context> io_ctx_a, nano::rpc_config const & config_a, nano::rpc_handler_interface & rpc_handler_interface_a)
 {
 	std::unique_ptr<rpc> impl;
 

nano/rpc/rpc.hpp

@@ -20,25 +20,29 @@ class rpc_handler_interface;
 class rpc
 {
 public:
-	rpc (boost::asio::io_context & io_ctx_a, nano::rpc_config config_a, nano::rpc_handler_interface & rpc_handler_interface_a);
+	rpc (std::shared_ptr<boost::asio::io_context>, nano::rpc_config config_a, nano::rpc_handler_interface & rpc_handler_interface_a);
 	virtual ~rpc ();
+
 	void start ();
-	virtual void accept ();
 	void stop ();
 
-	std::uint16_t listening_port ()
+	virtual void accept ();
+
+	std::uint16_t listening_port () const
 	{
 		return acceptor.local_endpoint ().port ();
 	}
 
+public:
 	nano::logger logger{ "rpc" };
 	nano::rpc_config config;
-	boost::asio::ip::tcp::acceptor acceptor;
+	std::shared_ptr<boost::asio::io_context> io_ctx_shared;
 	boost::asio::io_context & io_ctx;
+	boost::asio::ip::tcp::acceptor acceptor;
 	nano::rpc_handler_interface & rpc_handler_interface;
 	bool stopped{ false };
 };
 
 /** Returns the correct RPC implementation based on TLS configuration */
-std::unique_ptr<nano::rpc> get_rpc (boost::asio::io_context & io_ctx_a, nano::rpc_config const & config_a, nano::rpc_handler_interface & rpc_handler_interface_a);
+std::unique_ptr<nano::rpc> get_rpc (std::shared_ptr<boost::asio::io_context>, nano::rpc_config const & config_a, nano::rpc_handler_interface & rpc_handler_interface_a);
 }

nano/rpc_test/rpc.cpp

@@ -6047,7 +6047,7 @@ TEST (rpc, simultaneous_calls)
 	ASSERT_TRUE (ipc_tcp_port.has_value ());
 	rpc_config.rpc_process.num_ipc_connections = 8;
 	nano::ipc_rpc_processor ipc_rpc_processor (*system.io_ctx, rpc_config, ipc_tcp_port.value ());
-	nano::rpc rpc (*system.io_ctx, rpc_config, ipc_rpc_processor);
+	nano::rpc rpc (system.io_ctx, rpc_config, ipc_rpc_processor);
 	rpc.start ();
 	boost::property_tree::ptree request;
 	request.put ("action", "account_block_count");

nano/rpc_test/rpc_context.cpp

@@ -50,7 +50,7 @@ nano::test::rpc_context nano::test::add_rpc (nano::test::system & system, std::s
 	const auto ipc_tcp_port = ipc_server->listening_tcp_port ();
 	debug_assert (ipc_tcp_port.has_value ());
 	auto ipc_rpc_processor (std::make_unique<nano::ipc_rpc_processor> (*system.io_ctx, rpc_config, ipc_tcp_port.value ()));
-	auto rpc (std::make_shared<nano::rpc> (*system.io_ctx, rpc_config, *ipc_rpc_processor));
+	auto rpc (std::make_shared<nano::rpc> (system.io_ctx, rpc_config, *ipc_rpc_processor));
 	rpc->start ();
 
 	return rpc_context{ rpc, ipc_server, ipc_rpc_processor, node_rpc_config };

nano/slow_test/bootstrap.cpp

@@ -35,7 +35,7 @@ class rpc_wrapper
 		rpc_config{ node.network_params.network, port, true },
 		ipc{ node, node_rpc_config },
 		ipc_rpc_processor{ *system.io_ctx, rpc_config },
-		rpc{ *system.io_ctx, rpc_config, ipc_rpc_processor }
+		rpc{ system.io_ctx, rpc_config, ipc_rpc_processor }
 	{
 	}