Better split of responsabilities between CheckerSide and RemoteApp

Define in CheckerSide the callbacks that are used in there, instead of
defining it in the RemoteApp and passing it along to the CheckerSide.

Let's be optimistic: this code is every day a bit less messy.

diff --git a/src/mc/api/RemoteApp.cpp b/src/mc/api/RemoteApp.cpp
index 6d250ba..813a482 100644 (file)
--- a/src/mc/api/RemoteApp.cpp
+++ b/src/mc/api/RemoteApp.cpp
@@ -126,10 +126,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 process   = std::make_unique<simgrid::mc::RemoteProcessMemory>(pid);
-  model_checker_ = std::make_unique<simgrid::mc::ModelChecker>(std::move(process));
-
+  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();
+
   start();
 
   /* Take the initial snapshot */
@@ -149,36 +149,7 @@ RemoteApp::~RemoteApp()
 }
 void RemoteApp::start()
 {
-  checker_side_->start(
-      [](evutil_socket_t sig, short events, void* arg) {
-        auto checker = static_cast<simgrid::mc::CheckerSide*>(arg);
-        if (events == EV_READ) {
-          std::array<char, MC_MESSAGE_LENGTH> buffer;
-          ssize_t size = recv(checker->get_channel().get_socket(), buffer.data(), buffer.size(), MSG_DONTWAIT);
-          if (size == -1) {
-            XBT_ERROR("Channel::receive failure: %s", strerror(errno));
-            if (errno != EAGAIN)
-              throw simgrid::xbt::errno_error();
-          }
-
-          if (not mc_model_checker->handle_message(buffer.data(), size))
-            checker->break_loop();
-        } else {
-          xbt_die("Unexpected event");
-        }
-      },
-      [](evutil_socket_t sig, short events, void* arg) {
-        auto mc = static_cast<simgrid::mc::ModelChecker*>(arg);
-        if (events == EV_SIGNAL) {
-          if (sig == SIGCHLD)
-            mc->handle_waitpid();
-          else
-            xbt_die("Unexpected signal: %d", sig);
-        } else {
-          xbt_die("Unexpected event");
-        }
-      },
-      model_checker_.get());
+  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 c797daa..02e8e05 100644 (file)
--- a/src/mc/remote/CheckerSide.cpp
+++ b/src/mc/remote/CheckerSide.cpp
@@ -4,22 +4,57 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/remote/CheckerSide.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "xbt/system_error.hpp"
 #include <csignal>
 #include <sys/wait.h>
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkerside, mc, "MC communication with the application");
+
 namespace simgrid::mc {
 
-void CheckerSide::start(void (*handler_sock)(int, short, void*), void (*handler_sig)(int, short, void*),
-                        ModelChecker* mc)
+void CheckerSide::start(ModelChecker* mc)
 {
   auto* base = event_base_new();
   base_.reset(base);
 
-  auto* socket_event = event_new(base, get_channel().get_socket(), EV_READ | EV_PERSIST, handler_sock, this);
+  auto* socket_event = event_new(
+      base, get_channel().get_socket(), EV_READ | EV_PERSIST,
+      [](evutil_socket_t sig, short events, void* arg) {
+        auto checker = static_cast<simgrid::mc::CheckerSide*>(arg);
+        if (events == EV_READ) {
+          std::array<char, MC_MESSAGE_LENGTH> buffer;
+          ssize_t size = recv(checker->get_channel().get_socket(), buffer.data(), buffer.size(), MSG_DONTWAIT);
+          if (size == -1) {
+            XBT_ERROR("Channel::receive failure: %s", strerror(errno));
+            if (errno != EAGAIN)
+              throw simgrid::xbt::errno_error();
+          }
+
+          if (not mc_model_checker->handle_message(buffer.data(), size))
+            checker->break_loop();
+        } else {
+          xbt_die("Unexpected event");
+        }
+      },
+      this);
   event_add(socket_event, nullptr);
   socket_event_.reset(socket_event);
 
-  auto* signal_event = event_new(base, SIGCHLD, EV_SIGNAL | EV_PERSIST, handler_sig, mc);
+  auto* signal_event = event_new(
+      base, SIGCHLD, EV_SIGNAL | EV_PERSIST,
+      [](evutil_socket_t sig, short events, void* arg) {
+        auto mc = static_cast<simgrid::mc::ModelChecker*>(arg);
+        if (events == EV_SIGNAL) {
+          if (sig == SIGCHLD)
+            mc->handle_waitpid();
+          else
+            xbt_die("Unexpected signal: %d", sig);
+        } else {
+          xbt_die("Unexpected event");
+        }
+      },
+      mc);
   event_add(signal_event, nullptr);
   signal_event_.reset(signal_event);
 }

diff --git a/src/mc/remote/CheckerSide.hpp b/src/mc/remote/CheckerSide.hpp
index 725ab09..d2d5955 100644 (file)
--- a/src/mc/remote/CheckerSide.hpp
+++ b/src/mc/remote/CheckerSide.hpp
@@ -33,7 +33,7 @@ public:
   Channel const& get_channel() const { return channel_; }
   Channel& get_channel() { return channel_; }
 
-  void start(void (*handler_sock)(int, short, void*), void (*handler_sig)(int, short, void*), ModelChecker* mc);
+  void start(ModelChecker* mc);
   void dispatch() const;
   void break_loop() const;
 };