fcgi/Stock: pass CgiChildParams to Get()

Reducing the number of parameters, making the API simpler.

Author: MaxKellermann

src/fcgi/Request.cxx

@@ -9,6 +9,7 @@
 #include "http/PendingRequest.hxx"
 #include "http/ResponseHandler.hxx"
 #include "cgi/Address.hxx"
+#include "cgi/ChildParams.hxx"
 #include "stock/AbstractStock.hxx"
 #include "stock/GetHandler.hxx"
 #include "stock/Item.hxx"
@@ -89,13 +90,18 @@ class FcgiRequest final
 	}
 
 	void BeginConnect() noexcept {
+		auto *params = NewFromPool<CgiChildParams>(pool,
+							   address.GetAction(),
+							   address.args.ToArray(pool),
+							   address.options,
+							   address.parallelism,
+							   address.concurrency,
+							   false);
+
 		const TempPoolLease tpool;
 		const auto key = address.GetChildId(*tpool);
 
-		fcgi_stock.Get(key, address.options,
-			       address.GetAction(), address.args.ToArray(pool),
-			       address.parallelism, address.concurrency,
-			       *this, cancel_ptr);
+		fcgi_stock.Get(key, *params, *this, cancel_ptr);
 	}
 
 private:

src/fcgi/Stock.cxx

@@ -192,21 +192,16 @@ FcgiStock::FadeTag(std::string_view tag) noexcept
 }
 
 void
-FcgiStock::Get(StockKey key, const ChildOptions &options,
-	       const char *executable_path,
-	       std::span<const char *const> args,
-	       unsigned parallelism, unsigned concurrency,
+FcgiStock::Get(StockKey key, const CgiChildParams &params,
 	       StockGetHandler &handler,
 	       CancellablePointer &cancel_ptr) noexcept
 {
+	unsigned concurrency = params.concurrency;
 	if (concurrency <= 1)
 		/* no concurrency by default */
 		concurrency = 1;
 
-	auto r = ToDeletePointer(new CgiChildParams(executable_path,
-						    args, options,
-						    parallelism, concurrency, false));
-	mchild_stock.Get(key, std::move(r),
+	mchild_stock.Get(key, ToNopPointer(&params),
 			 concurrency,
 			 handler, cancel_ptr);
 }

src/fcgi/Stock.hxx

@@ -16,7 +16,7 @@ struct ChildErrorLogOptions;
 class StockItem;
 class StockGetHandler;
 class FcgiStock;
-struct ChildOptions;
+struct CgiChildParams;
 class EventLoop;
 class SpawnService;
 class ListenStreamStock;
@@ -49,12 +49,11 @@ public:
 	}
 
 	/**
-	 * @param args command-line arguments
+	 * @param params a description of the FastCGI process; the
+	 * pointed-to object must remain valid until the request
+	 * completes
 	 */
-	void Get(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;