From 4d4a8af70cf81e9dbc9e81cbbd76233e99d3c628 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 18 Mar 2023 12:21:30 +0100
Subject: [PATCH] Merge CheckerSide::start() intp the constructor

---
 src/mc/api/RemoteApp.cpp      | 4 +---
 src/mc/remote/CheckerSide.cpp | 3 +--
 src/mc/remote/CheckerSide.hpp | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mc/api/RemoteApp.cpp b/src/mc/api/RemoteApp.cpp
index 813a482c02..969e5c3d85 100644
--- a/src/mc/api/RemoteApp.cpp
+++ b/src/mc/api/RemoteApp.cpp
@@ -125,10 +125,10 @@ RemoteApp::RemoteApp(const std::vector<char*>& args)
 
   xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
 
-  checker_side_  = std::make_unique<simgrid::mc::CheckerSide>(sockets[1]);
   auto memory      = std::make_unique<simgrid::mc::RemoteProcessMemory>(pid);
   model_checker_   = std::make_unique<simgrid::mc::ModelChecker>(std::move(memory));
   mc_model_checker = model_checker_.get();
+  checker_side_    = std::make_unique<simgrid::mc::CheckerSide>(sockets[1], model_checker_.get());
 
   start();
 
@@ -149,8 +149,6 @@ RemoteApp::~RemoteApp()
 }
 void RemoteApp::start()
 {
-  checker_side_->start(model_checker_.get());
-
   XBT_DEBUG("Waiting for the model-checked process");
   int status;
 
diff --git a/src/mc/remote/CheckerSide.cpp b/src/mc/remote/CheckerSide.cpp
index 02e8e05565..bef9b3ec7b 100644
--- a/src/mc/remote/CheckerSide.cpp
+++ b/src/mc/remote/CheckerSide.cpp
@@ -12,8 +12,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkerside, mc, "MC communication with the application");
 
 namespace simgrid::mc {
-
-void CheckerSide::start(ModelChecker* mc)
+CheckerSide::CheckerSide(int sockfd, ModelChecker* mc) : channel_(sockfd)
 {
   auto* base = event_base_new();
   base_.reset(base);
diff --git a/src/mc/remote/CheckerSide.hpp b/src/mc/remote/CheckerSide.hpp
index d2d595524d..fced9be1e7 100644
--- a/src/mc/remote/CheckerSide.hpp
+++ b/src/mc/remote/CheckerSide.hpp
@@ -23,7 +23,7 @@ class CheckerSide {
   Channel channel_;
 
 public:
-  explicit CheckerSide(int sockfd) : channel_(sockfd) {}
+  explicit CheckerSide(int sockfd, ModelChecker* mc);
 
   // No copy:
   CheckerSide(CheckerSide const&) = delete;
@@ -33,7 +33,6 @@ public:
   Channel const& get_channel() const { return channel_; }
   Channel& get_channel() { return channel_; }
 
-  void start(ModelChecker* mc);
   void dispatch() const;
   void break_loop() const;
 };
-- 
2.20.1