Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / mc / remote / CheckerSide.cpp

diff --git a/src/mc/remote/CheckerSide.cpp b/src/mc/remote/CheckerSide.cpp
index 1a974f0af8ad9966ae748f435a707335a871895f..f7316ece6de252b8861c9a7284dea7c7f10ec941 100644 (file)
--- a/src/mc/remote/CheckerSide.cpp
+++ b/src/mc/remote/CheckerSide.cpp
@@ -128,10 +128,9 @@ void CheckerSide::setup_events(bool socket_only)
   socket_event_ = event_new(
       base, get_channel().get_socket(), EV_READ | EV_PERSIST,
       [](evutil_socket_t, short events, void* arg) {
-        auto checker = static_cast<simgrid::mc::CheckerSide*>(arg);
+        auto* checker = static_cast<simgrid::mc::CheckerSide*>(arg);
         if (events == EV_READ) {
           do {
-
             std::array<char, MC_MESSAGE_LENGTH> buffer;
             ssize_t size = checker->get_channel().receive(buffer.data(), buffer.size(), MSG_DONTWAIT);
             if (size == -1) {
@@ -160,7 +159,7 @@ void CheckerSide::setup_events(bool socket_only)
     signal_event_ = event_new(
         base, SIGCHLD, EV_SIGNAL | EV_PERSIST,
         [](evutil_socket_t sig, short events, void* arg) {
-          auto checker = static_cast<simgrid::mc::CheckerSide*>(arg);
+          auto* checker = static_cast<simgrid::mc::CheckerSide*>(arg);
           if (events == EV_SIGNAL) {
             if (sig == SIGCHLD)
               checker->handle_waitpid();
@@ -185,7 +184,7 @@ CheckerSide::CheckerSide(const std::vector<char*>& args, bool need_memory_info)
   int sockets[2];
   xbt_assert(socketpair(AF_UNIX,
 #ifdef __APPLE__
-                        SOCK_STREAM, /* Mac OSX does not have AF_UNIX + SOCK_SEQPACKET, even if that's faster*/
+                        SOCK_STREAM, /* Mac OSX does not have AF_UNIX + SOCK_SEQPACKET, even if that's faster */
 #else
                         SOCK_SEQPACKET,
 #endif
@@ -259,11 +258,12 @@ CheckerSide::CheckerSide(int socket, CheckerSide* child_checker)
   wait_for_requests();
 }
 
-std::unique_ptr<CheckerSide> CheckerSide::clone(int master_socket)
+std::unique_ptr<CheckerSide> CheckerSide::clone(int master_socket, const std::string& master_socket_name)
 {
-  s_mc_message_int_t m = {};
-  m.type               = MessageType::FORK;
-  m.value              = getpid();
+  s_mc_message_fork_t m = {};
+  m.type                = MessageType::FORK;
+  xbt_assert(master_socket_name.size() == MC_SOCKET_NAME_LEN);
+  std::copy_n(begin(master_socket_name), MC_SOCKET_NAME_LEN, begin(m.socket_name));
   xbt_assert(get_channel().send(m) == 0, "Could not ask the app to fork on need.");
 
   int sock = accept(master_socket, nullptr /* I know who's connecting*/, nullptr);
@@ -288,7 +288,7 @@ void CheckerSide::finalize(bool terminate_asap)
              (int)answer.type, (int)MessageType::FINALIZE_REPLY);
 }
 
-void CheckerSide::dispatch_events()
+void CheckerSide::dispatch_events() const
 {
   event_base_dispatch(base_.get());
 }
@@ -354,6 +354,20 @@ bool CheckerSide::handle_message(const char* buffer, ssize_t size)
       break;
     }
 
+    case MessageType::UNIGNORE_MEMORY: {
+      consumed = sizeof(s_mc_message_ignore_memory_t);
+#if SIMGRID_HAVE_STATEFUL_MC
+      if (remote_memory_ != nullptr) {
+        s_mc_message_ignore_memory_t message;
+        xbt_assert(size >= static_cast<ssize_t>(sizeof(message)), "Broken message");
+        memcpy(&message, buffer, sizeof(message));
+        get_remote_memory()->unignore_region(message.addr, message.size);
+      } else
+#endif
+        XBT_INFO("Ignoring an UNIGNORE_MEMORY message because we don't need to introspect memory.");
+      break;
+    }
+
     case MessageType::STACK_REGION: {
       consumed = sizeof(s_mc_message_stack_region_t);
 #if SIMGRID_HAVE_STATEFUL_MC
@@ -489,7 +503,6 @@ void CheckerSide::handle_waitpid()
     }
 
   } else { // Ask our proxy to wait for us
-
     s_mc_message_int_t request = {};
     request.type               = MessageType::WAIT_CHILD;
     request.value              = pid_;