workshop/Workplace: move control channel initialization to WorkshopOperator::Start()

Author: MaxKellermann

src/workshop/Operator.cxx

@@ -71,18 +71,12 @@ WorkshopOperator::WorkshopOperator(EventLoop &_event_loop,
 				   const std::shared_ptr<Plan> &_plan,
 				   UniqueFileDescriptor stderr_read_pipe,
 				   UniqueFileDescriptor _stderr_write_pipe,
-				   UniqueSocketDescriptor control_socket,
 				   size_t max_log_buffer,
 				   bool enable_journal) noexcept
 	:event_loop(_event_loop),
 	 workplace(_workplace), job(_job), plan(_plan),
 	 logger(*this),
 	 timeout_event(event_loop, BIND_THIS_METHOD(OnTimeout)),
-	 control_channel(control_socket.IsDefined()
-			 ? new WorkshopControlChannelServer(event_loop,
-							    std::move(control_socket),
-							    *this)
-			 : nullptr),
 	 stderr_write_pipe(std::move(_stderr_write_pipe)),
 	 log(event_loop, job.plan_name, job.id,
 	     std::move(stderr_read_pipe))
@@ -135,11 +129,25 @@ PrepareChildProcess(PreparedChildProcess &p, const char *plan_name,
 }
 
 void
-WorkshopOperator::Start(FileDescriptor stderr_w,
-			SocketDescriptor control_child)
+WorkshopOperator::Start(FileDescriptor stderr_w)
 {
 	auto &spawn_service = workplace.GetSpawnService();
 
+	/* create control socket */
+
+	UniqueSocketDescriptor control_child;
+	if (plan->control_channel) {
+		UniqueSocketDescriptor control_parent;
+		std::tie(control_parent, control_child) = CreateSocketPair(SOCK_SEQPACKET);
+
+		control_parent.SetNonBlocking();
+
+		WorkshopControlChannelHandler &handler = *this;
+		control_channel = std::make_unique<WorkshopControlChannelServer>(event_loop,
+										 std::move(control_parent),
+										 handler);
+	}
+
 	PreparedChildProcess p;
 	PrepareChildProcess(p, job.plan_name.c_str(), *plan,
 			    stderr_w, control_child);

src/workshop/Operator.hxx

@@ -90,7 +90,6 @@ public:
 			 const std::shared_ptr<Plan> &_plan,
 			 UniqueFileDescriptor stderr_read_pipe,
 			 UniqueFileDescriptor _stderr_write_pipe,
-			 UniqueSocketDescriptor control_socket,
 			 size_t max_log_buffer,
 			 bool enable_journal) noexcept;
 
@@ -108,8 +107,7 @@ public:
 		return job.plan_name;
 	}
 
-	void Start(FileDescriptor stderr_w,
-		   SocketDescriptor control_child);
+	void Start(FileDescriptor stderr_w);
 
 	void SetPid(std::unique_ptr<ChildProcessHandle> &&_pid) noexcept {
 		pid = std::move(_pid);

src/workshop/Workplace.cxx

@@ -96,15 +96,6 @@ WorkshopWorkplace::Start(EventLoop &event_loop, const WorkshopJob &job,
 	auto [stderr_r, stderr_w] = CreatePipe();
 	stderr_r.SetNonBlocking();
 
-	/* create control socket */
-
-	UniqueSocketDescriptor control_parent, control_child;
-	if (plan->control_channel) {
-		std::tie(control_parent, control_child) = CreateSocketPair(SOCK_SEQPACKET);
-
-		control_parent.SetNonBlocking();
-	}
-
 	/* create operator object */
 
 	UniqueFileDescriptor stderr_w_for_operator =
@@ -115,10 +106,9 @@ WorkshopWorkplace::Start(EventLoop &event_loop, const WorkshopJob &job,
 	auto o = std::make_unique<WorkshopOperator>(event_loop, *this, job, std::move(plan),
 						    std::move(stderr_r),
 						    std::move(stderr_w_for_operator),
-						    std::move(control_parent),
 						    max_log,
 						    enable_journal);
-	o->Start(stderr_w, control_child);
+	o->Start(stderr_w);
 
 	operators.push_back(*o.release());
 }