was/async/Control: add io_uring support

debian/changelog

@@ -2,6 +2,7 @@ cm4all-beng-proxy (19.2) unstable; urgency=low
 
   * http/local: fix crash bug (19.0 regression)
   * was: reduce the number of epoll_ctl() system calls again
+  * was: receive from control channel using io_uring
 
  --   
 

src/bp/Main.cxx

@@ -460,7 +460,15 @@ try {
 		new RemoteWasStock(instance.config.remote_was_stock_limit,
 				   instance.config.remote_was_stock_max_idle,
 				   instance.event_loop);
-#endif
+
+#ifdef HAVE_URING
+	if (instance.uring) {
+		instance.was_stock->EnableUring(*instance.uring);
+		instance.multi_was_stock->EnableUring(*instance.uring);
+		instance.remote_was_stock->EnableUring(*instance.uring);
+	}
+#endif // HAVE_URING
+#endif // HAVE_LIBWAS
 
 	instance.delegate_stock = delegate_stock_new(instance.event_loop,
 						     *instance.spawn_service);

src/was/IdleConnection.hxx

@@ -47,6 +47,12 @@ public:
 			  WasSocket &&_socket,
 			  WasIdleConnectionHandler &_handler) noexcept;
 
+#ifdef HAVE_URING
+	void EnableUring(Uring::Queue &uring_queue) {
+		control.EnableUring(uring_queue);
+	}
+#endif
+
 	auto &GetEventLoop() const noexcept {
 		return control.GetEventLoop();
 	}

src/was/MStock.cxx

@@ -190,7 +190,14 @@ MultiWasStock::Create(CreateStockItem c, StockItem &shared_item)
 {
 	auto &child = (MultiWasChild &)shared_item;
 
-	return new MultiWasConnection(c, child);
+	auto *connection = new MultiWasConnection(c, child);
+
+#ifdef HAVE_URING
+	if (uring_queue != nullptr)
+		connection->EnableUring(*uring_queue);
+#endif
+
+	return connection;
 }
 
 void

src/was/MStock.hxx

@@ -7,6 +7,7 @@
 #include "spawn/ChildStock.hxx"
 #include "stock/MultiStock.hxx"
 #include "pool/Ptr.hxx"
+#include "io/uring/config.h" // for HAVE_URING
 
 #include <span>
 
@@ -18,11 +19,19 @@ class SocketDescriptor;
 class EventLoop;
 class SpawnService;
 
+#ifdef HAVE_URING
+namespace Uring { class Queue; }
+#endif
+
 class MultiWasStock final : MultiStockClass, ChildStockClass {
 	PoolPtr pool;
 	ChildStock child_stock;
 	MultiStock mchild_stock;
 
+#ifdef HAVE_URING
+	Uring::Queue *uring_queue = nullptr;
+#endif
+
 public:
 	MultiWasStock(unsigned limit, unsigned max_idle,
 		      EventLoop &event_loop, SpawnService &spawn_service,
@@ -33,6 +42,12 @@ public:
 		return mchild_stock.GetEventLoop();
 	}
 
+#ifdef HAVE_URING
+	void EnableUring(Uring::Queue &_uring_queue) noexcept {
+		uring_queue = &_uring_queue;
+	}
+#endif
+
 	std::size_t DiscardSome() noexcept {
 		return mchild_stock.DiscardOldestIdle(64);
 	}

src/was/RStock.cxx

@@ -132,7 +132,14 @@ RemoteWasStock::Create(CreateStockItem c, StockItem &shared_item)
 {
 	auto &multi_connection = (RemoteMultiWasConnection &)shared_item;
 
-	return new WasStockConnection(c, multi_connection.Connect());
+	auto *connection = new WasStockConnection(c, multi_connection.Connect());
+
+#ifdef HAVE_URING
+	if (uring_queue != nullptr)
+		connection->EnableUring(*uring_queue);
+#endif
+
+	return connection;
 }
 
 void

src/was/RStock.hxx

@@ -6,10 +6,15 @@
 
 #include "stock/Class.hxx"
 #include "stock/MultiStock.hxx"
+#include "io/uring/config.h" // for HAVE_URING
 
 class AllocatorPtr;
 class SocketAddress;
 
+#ifdef HAVE_URING
+namespace Uring { class Queue; }
+#endif
+
 class RemoteWasStock final : MultiStockClass {
 	class MultiClientStockClass final : public StockClass {
 	public:
@@ -23,6 +28,10 @@ class RemoteWasStock final : MultiStockClass {
 
 	MultiStock multi_stock;
 
+#ifdef HAVE_URING
+	Uring::Queue *uring_queue = nullptr;
+#endif
+
 public:
 	RemoteWasStock(unsigned limit, unsigned max_idle,
 		       EventLoop &event_loop) noexcept;
@@ -31,6 +40,12 @@ public:
 		return multi_stock.GetEventLoop();
 	}
 
+#ifdef HAVE_URING
+	void EnableUring(Uring::Queue &_uring_queue) noexcept {
+		uring_queue = &_uring_queue;
+	}
+#endif
+
 	void FadeAll() noexcept {
 		multi_stock.FadeAll();
 	}

src/was/SConnection.hxx

@@ -18,6 +18,12 @@ class WasStockConnection
 public:
 	WasStockConnection(CreateStockItem c, WasSocket &&_socket) noexcept;
 
+#ifdef HAVE_URING
+	void EnableUring(Uring::Queue &uring_queue) {
+		connection.EnableUring(uring_queue);
+	}
+#endif
+
 	auto &GetEventLoop() const noexcept {
 		return connection.GetEventLoop();
 	}

src/was/Stock.cxx

@@ -120,6 +120,11 @@ WasStock::Create(CreateStockItem c, StockRequest _request,
 	   callback, because the latter may destroy the pool */
 	_request.reset();
 
+#ifdef HAVE_URING
+	if (uring_queue != nullptr)
+		child->EnableUring(*uring_queue);
+#endif
+
 	child->InvokeCreateSuccess(handler);
 }
 

src/was/Stock.hxx

@@ -8,6 +8,7 @@
 #include "stock/Class.hxx"
 #include "stock/MapStock.hxx"
 #include "net/SocketDescriptor.hxx"
+#include "io/uring/config.h" // for HAVE_URING
 
 #include <span>
 #include <string_view>
@@ -19,6 +20,10 @@ struct WasSocket;
 class SpawnService;
 class ListenStreamStock;
 
+#ifdef HAVE_URING
+namespace Uring { class Queue; }
+#endif
+
 /**
  * Launch and manage WAS child processes.
  */
@@ -39,6 +44,10 @@ class WasStock final : StockClass {
 
 	WasStockMap stock;
 
+#ifdef HAVE_URING
+	Uring::Queue *uring_queue = nullptr;
+#endif
+
 public:
 	explicit WasStock(EventLoop &event_loop, SpawnService &_spawn_service,
 			  ListenStreamStock *_listen_stream_stock,
@@ -55,6 +64,12 @@ public:
 		return stock.GetEventLoop();
 	}
 
+#ifdef HAVE_URING
+	void EnableUring(Uring::Queue &_uring_queue) noexcept {
+		uring_queue = &_uring_queue;
+	}
+#endif
+
 	void FadeAll() noexcept {
 		stock.FadeAll();
 	}