DelegateOpen, R{Bind,Connect}: use CoEnqueueSpawner and CoWaitSpawnCo…

…mpletion
CM4all · Jul 8, 2024 · c2cd1eb · c2cd1eb
1 parent 9243d7a
commit c2cd1eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/DelegateOpen.cxx b/src/DelegateOpen.cxx
@@ -4,6 +4,8 @@
 
 #include "DelegateOpen.hxx"
 #include "Connection.hxx"
+#include "spawn/CoEnqueue.hxx"
+#include "spawn/CoWaitSpawnCompletion.hxx"
 #include "spawn/Interface.hxx"
 #include "spawn/Prepared.hxx"
 #include "spawn/ProcessHandle.hxx"
@@ -80,8 +82,14 @@ SendOpen(SocketDescriptor s, std::string_view path)
 Co::Task<UniqueFileDescriptor>
 DelegateOpen(const Connection &ssh_connection, std::string_view path)
 {
+	/* throttle if the spawner is under pressure */
+	co_await CoEnqueueSpawner{ssh_connection.GetSpawnService()};
+
 	auto [control_socket, child_handle] = SpawnOpen(ssh_connection);
 
+	/* wait for spawner completion and rethrow errors */
+	co_await CoWaitSpawnCompletion{*child_handle};
+
 	SendOpen(control_socket, path);
 
 	co_await AwaitableSocketEvent(ssh_connection.GetEventLoop(),

diff --git a/src/RBind.cxx b/src/RBind.cxx
@@ -26,6 +26,8 @@ using std::string_view_literals::operator""sv;
 #ifdef ENABLE_TRANSLATION
 
 #include "translation/Response.hxx"
+#include "spawn/CoEnqueue.hxx"
+#include "spawn/CoWaitSpawnCompletion.hxx"
 #include "spawn/ChildOptions.hxx"
 #include "spawn/ProcessHandle.hxx"
 #include "spawn/Prepared.hxx"
@@ -151,9 +153,15 @@ NsResolveBindTCP(EventLoop &event_loop,
 		 SpawnService &spawn_service, const ChildOptions &options,
 		 std::string_view host, const unsigned port)
 {
+	/* throttle if the spawner is under pressure */
+	co_await CoEnqueueSpawner{spawn_service};
+
 	auto [control_socket, child_handle] =
 		SpawnNsResolveBindTCPFunction(spawn_service, options);
 
+	/* wait for spawner completion and rethrow errors */
+	co_await CoWaitSpawnCompletion{*child_handle};
+
 	co_return co_await SpawnResolveBind(event_loop, control_socket, host, port);
 }
 

diff --git a/src/RConnect.cxx b/src/RConnect.cxx
@@ -23,6 +23,8 @@
 #ifdef ENABLE_TRANSLATION
 
 #include "translation/Response.hxx"
+#include "spawn/CoEnqueue.hxx"
+#include "spawn/CoWaitSpawnCompletion.hxx"
 #include "spawn/ChildOptions.hxx"
 #include "spawn/ProcessHandle.hxx"
 #include "spawn/Prepared.hxx"
@@ -132,9 +134,15 @@ NsResolveConnectTCP(EventLoop &event_loop,
 		    SpawnService &spawn_service, const ChildOptions &options,
 		    std::string_view host, const unsigned port)
 {
+	/* throttle if the spawner is under pressure */
+	co_await CoEnqueueSpawner{spawn_service};
+
 	auto [control_socket, child_handle] =
 		SpawnNsResolveConnectTCPFunction(spawn_service, options);
 
+	/* wait for spawner completion and rethrow errors */
+	co_await CoWaitSpawnCompletion{*child_handle};
+
 	co_return co_await SpawnResolveConnect(event_loop, control_socket, host, port);
 }