was/Stock: pass CgiChildParams to Get()

Author: MaxKellermann

src/was/Glue.cxx

@@ -6,6 +6,7 @@
 #include "Stock.hxx"
 #include "SRequest.hxx"
 #include "cgi/Address.hxx"
+#include "cgi/ChildParams.hxx"
 #include "pool/pool.hxx"
 #include "pool/tpool.hxx"
 #include "util/StringCompare.hxx"
@@ -16,7 +17,6 @@
 class WasRequest final : WasStockRequest {
 	WasStock &was_stock;
 	const CgiAddress &address;
-	const std::span<const char *const> args;
 
 public:
 	WasRequest(struct pool &_pool, WasStock &_was_stock,
@@ -37,8 +37,7 @@ class WasRequest final : WasStockRequest {
 				 _address.params.ToArray(_pool),
 				 _metrics_handler, _handler),
 		 was_stock(_was_stock),
-		 address(_address),
-		 args(address.args.ToArray(pool)) {}
+		 address(_address) {}
 
 	using WasStockRequest::WasStockRequest;
 
@@ -49,13 +48,17 @@ class WasRequest final : WasStockRequest {
 
 protected:
 	void GetStockItem() noexcept override {
+		auto r = NewFromPool<CgiChildParams>(pool, address.GetAction(),
+						     address.args.ToArray(pool),
+						     address.options,
+						     address.parallelism,
+						     address.concurrency,
+						     address.disposable);
+
 		const TempPoolLease tpool;
 		const auto key = address.GetChildId(*tpool);
 
-		was_stock.Get(pool, key,
-			      address.options,
-			      address.GetAction(), args,
-			      address.parallelism, address.disposable,
+		was_stock.Get(key, *r,
 			      *this, cancel_ptr);
 	}
 };

src/was/MGlue.cxx

@@ -11,6 +11,7 @@
 #include "pool/tpool.hxx"
 #include "stopwatch.hxx"
 #include "cgi/Address.hxx"
+#include "cgi/ChildParams.hxx"
 #include "net/FormatAddress.hxx"
 #include "util/StringCompare.hxx"
 #include "AllocatorPtr.hxx"
@@ -52,13 +53,17 @@ class MultiWasRequest final : WasStockRequest
 
 protected:
 	void GetStockItem() noexcept override {
+		auto r = NewFromPool<CgiChildParams>(pool, address.GetAction(),
+						     address.args.ToArray(pool),
+						     address.options,
+						     address.parallelism,
+						     address.concurrency,
+						     address.disposable);
+
 		const TempPoolLease tpool;
 		const auto key = address.GetChildId(*tpool);
 
-		stock.Get(pool, key,
-			  address.options,
-			  address.GetAction(), args,
-			  address.parallelism, address.concurrency,
+		stock.Get(key, *r,
 			  *this, cancel_ptr);
 	}
 };

src/was/MStock.cxx

@@ -206,19 +206,11 @@ MultiWasStock::FadeTag(std::string_view tag) noexcept
 }
 
 void
-MultiWasStock::Get(AllocatorPtr alloc,
-		   StockKey key,
-		   const ChildOptions &options,
-		   const char *executable_path,
-		   std::span<const char *const> args,
-		   unsigned parallelism, unsigned concurrency,
+MultiWasStock::Get(StockKey key, const CgiChildParams &params,
 		   StockGetHandler &handler,
 		   CancellablePointer &cancel_ptr) noexcept
 {
-	auto r = NewDisposablePointer<CgiChildParams>(alloc, executable_path,
-						      args, options,
-						      parallelism, concurrency,
-						      false);
-
-	mchild_stock.Get(key, std::move(r), concurrency, handler, cancel_ptr);
+	mchild_stock.Get(key, ToNopPointer(&params),
+			 params.concurrency,
+			 handler, cancel_ptr);
 }

src/was/MStock.hxx

@@ -12,7 +12,7 @@
 #include <span>
 
 class AllocatorPtr;
-struct ChildOptions;
+struct CgiChildParams;
 class StockItem;
 struct WasSocket;
 class SocketDescriptor;
@@ -72,13 +72,12 @@ public:
 	/**
 	 * The resulting #StockItem will be a #WasStockConnection
 	 * instance.
+	 *
+	 * @param params a description of the WAS process; the
+	 * pointed-to object must remain valid until the request
+	 * completes
 	 */
-	void Get(AllocatorPtr alloc,
-		 StockKey key,
-		 const ChildOptions &options,
-		 const char *executable_path,
-		 std::span<const char *const> args,
-		 unsigned parallelism, unsigned concurrency,
+	void Get(StockKey key, const CgiChildParams &params,
 		 StockGetHandler &handler,
 		 CancellablePointer &cancel_ptr) noexcept;
 

src/was/Stock.cxx

@@ -136,21 +136,10 @@ WasChild::~WasChild() noexcept = default;
  */
 
 void
-WasStock::Get(AllocatorPtr alloc,
-	      StockKey key,
-	      const ChildOptions &options,
-	      const char *executable_path,
-	      std::span<const char *const> args,
-	      unsigned parallelism, bool disposable,
+WasStock::Get(StockKey key, const CgiChildParams &params,
 	      StockGetHandler &handler,
 	      CancellablePointer &cancel_ptr) noexcept
 {
-
-	auto r = NewDisposablePointer<CgiChildParams>(alloc, executable_path,
-						      args, options,
-						      parallelism,
-						      0,
-						      disposable);
-
-	stock.Get(key, std::move(r), handler, cancel_ptr);
+	stock.Get(key, ToNopPointer(&params),
+		  handler, cancel_ptr);
 }

src/was/Stock.hxx

@@ -16,7 +16,7 @@
 
 namespace Net::Log { class Sink; }
 class AllocatorPtr;
-struct ChildOptions;
+struct CgiChildParams;
 struct WasSocket;
 class SpawnService;
 class ListenStreamStock;
@@ -88,14 +88,11 @@ public:
 	 * The resulting #StockItem will be a #WasStockConnection
 	 * instance.
 	 *
-	 * @param args command-line arguments
+	 * @param params a description of the WAS process; the
+	 * pointed-to object must remain valid until the request
+	 * completes
 	 */
-	void Get(AllocatorPtr alloc,
-		 StockKey key,
-		 const ChildOptions &options,
-		 const char *executable_path,
-		 std::span<const char *const> args,
-		 unsigned parallelism, bool disposable,
+	void Get(StockKey key, const CgiChildParams &params,
 		 StockGetHandler &handler,
 		 CancellablePointer &cancel_ptr) noexcept;