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

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

diff --git a/src/mc/sosp/Region.cpp b/src/mc/sosp/Region.cpp
index a770cd3..2dca797 100644 (file)
--- a/src/mc/sosp/Region.cpp
+++ b/src/mc/sosp/Region.cpp
@@ -1,14 +1,12 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/mc/ModelChecker.hpp"
+#include "src/mc/sosp/Region.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_forward.hpp"
-
-#include "src/mc/mc_smx.hpp"
-#include "src/mc/sosp/Region.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
 
 #include <cstdlib>
 #include <sys/mman.h>
@@ -16,40 +14,37 @@
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
-Region::Region(RegionType region_type, void* start_addr, size_t size)
+Region::Region(PageStore& store, const RemoteProcessMemory& memory, RegionType region_type, void* start_addr,
+               size_t size)
     : region_type_(region_type), start_addr_(start_addr), size_(size)
 {
   xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize - 1)) == 0, "Start address not at the beginning of a page");
 
-  chunks_ = ChunkedData(mc_model_checker->page_store(), mc_model_checker->get_remote_simulation(),
-                        RemotePtr<void>(start_addr), mmu::chunk_count(size));
+  chunks_ = ChunkedData(store, memory, RemotePtr<void>(start_addr), mmu::chunk_count(size));
 }
 
 /** @brief Restore a region from a snapshot
  *
  *  @param region     Target region
  */
-void Region::restore()
+void Region::restore(const RemoteProcessMemory& memory) const
 {
   xbt_assert(((start().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
   xbt_assert(simgrid::mc::mmu::chunk_count(size()) == get_chunks().page_count());
 
   for (size_t i = 0; i != get_chunks().page_count(); ++i) {
-    void* target_page       = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)start().address());
+    auto* target_page       = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)start().address());
     const void* source_page = get_chunks().page(i);
-    mc_model_checker->get_remote_simulation().write_bytes(source_page, xbt_pagesize, remote(target_page));
+    memory.write_bytes(source_page, xbt_pagesize, remote(target_page));
   }
 }
 
 static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, const simgrid::mc::Region* region)
 {
-  auto split                = simgrid::mc::mmu::split(addr - region->start().address());
-  auto pageno               = split.first;
-  auto offset               = split.second;
-  void* snapshot_page       = region->get_chunks().page(pageno);
+  auto [pageno, offset] = simgrid::mc::mmu::split(addr - region->start().address());
+  void* snapshot_page   = region->get_chunks().page(pageno);
   return (char*)snapshot_page + offset;
 }
 
@@ -58,8 +53,8 @@ void* Region::read(void* target, const void* addr, std::size_t size) const
   xbt_assert(contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary.");
 
   // Last byte of the region:
-  const void* end = (const char*)addr + size - 1;
-  if (simgrid::mc::mmu::same_chunk((std::uintptr_t)addr, (std::uintptr_t)end)) {
+  const void* end_addr = (const char*)addr + size - 1;
+  if (simgrid::mc::mmu::same_chunk((std::uintptr_t)addr, (std::uintptr_t)end_addr)) {
     // The memory is contained in a single page:
     return mc_translate_address_region((uintptr_t)addr, this);
   }
@@ -70,14 +65,14 @@ void* Region::read(void* target, const void* addr, std::size_t size) const
   // We should remove this assumption.
 
   // Page of the last byte of the memory area:
-  size_t page_end = simgrid::mc::mmu::split((std::uintptr_t)end).first;
+  size_t page_end = simgrid::mc::mmu::split((std::uintptr_t)end_addr).first;
 
   void* dest = target; // iterator in the buffer to where we should copy next
 
   // Read each page:
   while (simgrid::mc::mmu::split((std::uintptr_t)addr).first != page_end) {
     const void* snapshot_addr = mc_translate_address_region((uintptr_t)addr, this);
-    void* next_page     = (void*)simgrid::mc::mmu::join(simgrid::mc::mmu::split((std::uintptr_t)addr).first + 1, 0);
+    auto* next_page     = (void*)simgrid::mc::mmu::join(simgrid::mc::mmu::split((std::uintptr_t)addr).first + 1, 0);
     size_t readable     = (char*)next_page - (const char*)addr;
     memcpy(dest, snapshot_addr, readable);
     addr = (const char*)addr + readable;
@@ -92,8 +87,7 @@ void* Region::read(void* target, const void* addr, std::size_t size) const
   return target;
 }
 
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 /** Compare memory between snapshots (with known regions)
  *