mc: Also remove the process_index

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

diff --git a/src/mc/sosp/RegionSnapshot.cpp b/src/mc/sosp/RegionSnapshot.cpp
index 13d6c5b..56a2395 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.cpp
+++ b/src/mc/sosp/RegionSnapshot.cpp
@@ -10,12 +10,11 @@
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-#include "mc/mc.h"
+#include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_config.hpp"
-#include "src/mc/sosp/mc_snapshot.hpp"
+#include "src/mc/mc_forward.hpp"
 
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/sosp/ChunkedData.hpp"
 #include "src/mc/sosp/RegionSnapshot.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc, "Logging specific to region snapshots");
@@ -28,12 +27,10 @@ RegionDense::RegionDense(RegionType region_type, void* start_addr, void* permane
 {
   flat_data_ = Buffer::malloc(size);
 
-  mc_model_checker->process().read_bytes(flat_data_.get(), size, remote(permanent_addr),
-                                         simgrid::mc::ProcessIndexDisabled);
+  mc_model_checker->process().read_bytes(flat_data_.get(), size, remote(permanent_addr));
 
   storage_type_ = StorageType::Flat;
   page_numbers_.clear();
-  privatized_regions_.clear();
 
   XBT_DEBUG("New region : type : %s, data : %p (real addr %p), size : %zu",
             (region_type == RegionType::Heap ? "Heap" : (region_type == RegionType::Data ? "Data" : "?")),
@@ -68,37 +65,39 @@ RegionSparse::RegionSparse(RegionType region_type, void* start_addr, void* perma
 
   storage_type_ = StorageType::Chunked;
   flat_data_.clear();
-  privatized_regions_.clear();
 
   page_numbers_ =
       ChunkedData(mc_model_checker->page_store(), *process, RemotePtr<void>(permanent_addr), mmu::chunk_count(size));
 }
 
-#if HAVE_SMPI
-RegionPrivatized::RegionPrivatized(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size)
-    : RegionSnapshot(region_type, start_addr, permanent_addr, size)
+/** @brief Restore a region from a snapshot
+ *
+ *  @param region     Target region
+ */
+void RegionSnapshot::restore()
 {
-  storage_type_ = StorageType::Privatized;
-
-  size_t process_count = MC_smpi_process_count();
-
-  // Read smpi_privatization_regions from MCed:
-  smpi_privatization_region_t remote_smpi_privatization_regions;
-  mc_model_checker->process().read_variable("smpi_privatization_regions", &remote_smpi_privatization_regions,
-                                            sizeof(remote_smpi_privatization_regions));
-  s_smpi_privatization_region_t privatization_regions[process_count];
-  mc_model_checker->process().read_bytes(&privatization_regions, sizeof(privatization_regions),
-                                         remote(remote_smpi_privatization_regions));
-
-  privatized_regions_.reserve(process_count);
-  for (size_t i = 0; i < process_count; i++)
-    privatized_regions_.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(
-        region(region_type, start_addr, privatization_regions[i].address, size)));
-
-  flat_data_.clear();
-  page_numbers_.clear();
+  switch (storage_type()) {
+    case simgrid::mc::StorageType::Flat:
+      mc_model_checker->process().write_bytes(flat_data().get(), size(), permanent_address());
+      break;
+
+    case simgrid::mc::StorageType::Chunked:
+      xbt_assert(((permanent_address().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
+      xbt_assert(simgrid::mc::mmu::chunk_count(size()) == page_data().page_count());
+
+      for (size_t i = 0; i != page_data().page_count(); ++i) {
+        void* target_page = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)permanent_address().address());
+        const void* source_page = page_data().page(i);
+        mc_model_checker->process().write_bytes(source_page, xbt_pagesize, remote(target_page));
+      }
+
+      break;
+
+    default: // includes StorageType::NoData
+      xbt_die("Storage type not supported");
+      break;
+  }
 }
-#endif
 
 } // namespace mc
 } // namespace simgrid