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

[simgrid.git] / src / mc / sosp / RemoteProcessMemory.cpp

diff --git a/src/mc/sosp/RemoteProcessMemory.cpp b/src/mc/sosp/RemoteProcessMemory.cpp
index 1973a93..1d256c1 100644 (file)
--- a/src/mc/sosp/RemoteProcessMemory.cpp
+++ b/src/mc/sosp/RemoteProcessMemory.cpp
@@ -8,6 +8,7 @@
 #include "src/mc/sosp/RemoteProcessMemory.hpp"
 
 #include "src/mc/explo/Exploration.hpp"
+#include "src/mc/explo/LivenessChecker.hpp"
 #include "src/mc/sosp/Snapshot.hpp"
 #include "xbt/file.hpp"
 #include "xbt/log.h"
@@ -24,8 +25,6 @@
 #include <mutex>
 #include <string>
 #include <string_view>
-#include <sys/ptrace.h>
-#include <sys/wait.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information");
 
@@ -107,9 +106,7 @@ int open_vm(pid_t pid, int flags)
 
 // ***** RemoteProcessMemory
 
-RemoteProcessMemory::RemoteProcessMemory(pid_t pid) : AddressSpace(this), pid_(pid), running_(true) {}
-
-void RemoteProcessMemory::init(xbt_mheap_t mmalloc_default_mdp)
+RemoteProcessMemory::RemoteProcessMemory(pid_t pid, xbt_mheap_t mmalloc_default_mdp) : AddressSpace(this), pid_(pid)
 {
   this->heap_address = remote(mmalloc_default_mdp);
 
@@ -398,6 +395,20 @@ void RemoteProcessMemory::ignore_region(std::uint64_t addr, std::size_t size)
     ignored_regions_.insert(pos, region);
 }
 
+void RemoteProcessMemory::unignore_region(std::uint64_t addr, std::size_t size)
+{
+  IgnoredRegion region;
+  region.addr = addr;
+  region.size = size;
+
+  auto pos = std::lower_bound(ignored_regions_.begin(), ignored_regions_.end(), region,
+                              [](auto const& reg1, auto const& reg2) {
+                                return reg1.addr < reg2.addr || (reg1.addr == reg2.addr && reg1.size < reg2.size);
+                              });
+  if (pos != ignored_regions_.end())
+    ignored_regions_.erase(pos);
+}
+
 void RemoteProcessMemory::ignore_heap(IgnoredHeapRegion const& region)
 {
   // Binary search the position of insertion:
@@ -455,54 +466,4 @@ void RemoteProcessMemory::dump_stack() const
   unw_destroy_addr_space(as);
 }
 
-void RemoteProcessMemory::handle_waitpid()
-{
-  XBT_DEBUG("Check for wait event");
-  int status;
-  pid_t pid;
-  while ((pid = waitpid(-1, &status, WNOHANG)) != 0) {
-    if (pid == -1) {
-      if (errno == ECHILD) { // No more children:
-        xbt_assert(not running(), "Inconsistent state");
-        break;
-      } else {
-        XBT_ERROR("Could not wait for pid");
-        throw simgrid::xbt::errno_error();
-      }
-    }
-
-    if (pid == this->pid()) {
-      // From PTRACE_O_TRACEEXIT:
-#ifdef __linux__
-      if (status >> 8 == (SIGTRAP | (PTRACE_EVENT_EXIT << 8))) {
-        unsigned long eventmsg;
-        xbt_assert(ptrace(PTRACE_GETEVENTMSG, pid, 0, &eventmsg) != -1, "Could not get exit status");
-        status = static_cast<int>(eventmsg);
-        if (WIFSIGNALED(status))
-          Exploration::get_instance()->report_crash(status);
-      }
-#endif
-
-      // We don't care about non-lethal signals, just reinject them:
-      if (WIFSTOPPED(status)) {
-        XBT_DEBUG("Stopped with signal %i", (int)WSTOPSIG(status));
-        errno = 0;
-#ifdef __linux__
-        ptrace(PTRACE_CONT, pid, 0, WSTOPSIG(status));
-#elif defined BSD
-        ptrace(PT_CONTINUE, pid, (caddr_t)1, WSTOPSIG(status));
-#endif
-        xbt_assert(errno == 0, "Could not PTRACE_CONT");
-      }
-
-      else if (WIFSIGNALED(status)) {
-        Exploration::get_instance()->report_crash(status);
-      } else if (WIFEXITED(status)) {
-        XBT_DEBUG("Child process is over");
-        terminate();
-      }
-    }
-  }
-}
-
 } // namespace simgrid::mc