MC: actually remove the comm channel from RemoteClientMemory

[simgrid.git] / src / mc / ModelChecker.cpp

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 709aa72..653976b 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -10,7 +10,7 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
 #include "src/mc/mc_private.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/remote/RemoteClientMemory.hpp"
 #include "xbt/automaton.hpp"
 #include "xbt/system_error.hpp"
 
@@ -32,32 +32,15 @@ using simgrid::mc::remote;
 namespace simgrid {
 namespace mc {
 
-ModelChecker::ModelChecker(std::unique_ptr<RemoteClient> process) : process_(std::move(process)) {}
-
-ModelChecker::~ModelChecker()
+ModelChecker::ModelChecker(std::unique_ptr<RemoteClientMemory> process, int sockfd)
+    : event_loop_(sockfd), process_(std::move(process))
 {
-  if (socket_event_ != nullptr)
-    event_free(socket_event_);
-  if (signal_event_ != nullptr)
-    event_free(signal_event_);
-  if (base_ != nullptr)
-    event_base_free(base_);
 }
 
 void ModelChecker::start()
 {
-  base_ = event_base_new();
-  event_callback_fn event_callback = [](evutil_socket_t fd, short events, void *arg)
-  {
-    ((ModelChecker *)arg)->handle_events(fd, events);
-  };
-  socket_event_ = event_new(base_, process_->get_channel().get_socket(), EV_READ | EV_PERSIST, event_callback, this);
-  event_add(socket_event_, NULL);
-  signal_event_ = event_new(base_,
-                            SIGCHLD,
-                            EV_SIGNAL|EV_PERSIST,
-                            event_callback, this);
-  event_add(signal_event_, NULL);
+  event_loop_.start(
+      [](evutil_socket_t sig, short events, void* arg) { ((ModelChecker*)arg)->handle_events(sig, events); });
 
   XBT_DEBUG("Waiting for the model-checked process");
   int status;
@@ -96,7 +79,7 @@ static const std::pair<const char*, const char*> ignored_local_variables[] = {
 
 void ModelChecker::setup_ignore()
 {
-  RemoteClient& process = this->process();
+  RemoteClientMemory& process = this->process();
   for (std::pair<const char*, const char*> const& var :
       ignored_local_variables)
     process.ignore_local_variable(var.first, var.second);
@@ -109,7 +92,7 @@ void ModelChecker::shutdown()
 {
   XBT_DEBUG("Shuting down model-checker");
 
-  RemoteClient* process = &this->process();
+  RemoteClientMemory* process = &this->process();
   if (process->running()) {
     XBT_DEBUG("Killing process");
     kill(process->pid(), SIGKILL);
@@ -117,9 +100,9 @@ void ModelChecker::shutdown()
   }
 }
 
-void ModelChecker::resume(RemoteClient& process)
+void ModelChecker::resume(RemoteClientMemory& process)
 {
-  int res = process.get_channel().send(MC_MESSAGE_CONTINUE);
+  int res = event_loop_.get_channel().send(MC_MESSAGE_CONTINUE);
   if (res)
     throw xbt::errno_error();
   process.clear_cache();
@@ -221,7 +204,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
     if (property_automaton == nullptr)
       property_automaton = xbt_automaton_new();
 
-    RemoteClient* process  = &this->process();
+    RemoteClientMemory* process = &this->process();
     RemotePtr<int> address = remote((int*)message.data);
     xbt::add_proposition(property_automaton, message.name, [process, address]() { return process->read(address); });
 
@@ -250,31 +233,26 @@ void ModelChecker::exit(int status)
   ::exit(status);
 }
 
-void ModelChecker::handle_events(int fd, short events)
+void ModelChecker::handle_events(int sig, short events)
 {
   if (events == EV_READ) {
     char buffer[MC_MESSAGE_LENGTH];
-    ssize_t size = process_->get_channel().receive(buffer, sizeof(buffer), false);
+    ssize_t size = event_loop_.get_channel().receive(buffer, sizeof(buffer), false);
     if (size == -1 && errno != EAGAIN)
       throw simgrid::xbt::errno_error();
-    if (not handle_message(buffer, size)) {
-      event_base_loopbreak(base_);
-    }
+
+    if (not handle_message(buffer, size))
+      event_loop_.break_loop();
   }
   else if (events == EV_SIGNAL) {
-    on_signal(fd);
+    if (sig == SIGCHLD)
+      this->handle_waitpid();
   }
   else {
     xbt_die("Unexpected event");
   }
 }
 
-void ModelChecker::loop()
-{
-  if (this->process().running())
-    event_base_dispatch(base_);
-}
-
 void ModelChecker::handle_waitpid()
 {
   XBT_DEBUG("Check for wait event");
@@ -327,17 +305,11 @@ void ModelChecker::handle_waitpid()
   }
 }
 
-void ModelChecker::on_signal(int signo)
-{
-  if (signo == SIGCHLD)
-    this->handle_waitpid();
-}
-
 void ModelChecker::wait_for_requests()
 {
   this->resume(process());
   if (this->process().running())
-    event_base_dispatch(base_);
+    event_loop_.dispatch();
 }
 
 void ModelChecker::handle_simcall(Transition const& transition)
@@ -347,18 +319,18 @@ void ModelChecker::handle_simcall(Transition const& transition)
   m.type  = MC_MESSAGE_SIMCALL_HANDLE;
   m.pid   = transition.pid_;
   m.value = transition.argument_;
-  this->process_->get_channel().send(m);
+  event_loop_.get_channel().send(m);
   this->process_->clear_cache();
   if (this->process_->running())
-    event_base_dispatch(base_);
+    event_loop_.dispatch();
 }
 
 bool ModelChecker::checkDeadlock()
 {
-  int res = this->process().get_channel().send(MC_MESSAGE_DEADLOCK_CHECK);
+  int res = event_loop_.get_channel().send(MC_MESSAGE_DEADLOCK_CHECK);
   xbt_assert(res == 0, "Could not check deadlock state");
   s_mc_message_int_t message;
-  ssize_t s = mc_model_checker->process().get_channel().receive(message);
+  ssize_t s = event_loop_.get_channel().receive(message);
   xbt_assert(s != -1, "Could not receive message");
   xbt_assert(s == sizeof(message) && message.type == MC_MESSAGE_DEADLOCK_CHECK_REPLY,
              "Received unexpected message %s (%i, size=%i) "