X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a07cc1dc95048c86a3fc76aca2e9c088f7b5025..1ffd336de7f3917df1d0cbbacc0e077b4b5c1363:/src/mc/sosp/RegionSnapshot.cpp

diff --git a/src/mc/sosp/RegionSnapshot.cpp b/src/mc/sosp/RegionSnapshot.cpp
index a657ea0774..13d6c5b25f 100644
--- a/src/mc/sosp/RegionSnapshot.cpp
+++ b/src/mc/sosp/RegionSnapshot.cpp
@@ -14,6 +14,7 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/sosp/mc_snapshot.hpp"
 
+#include "src/mc/mc_smx.hpp"
 #include "src/mc/sosp/ChunkedData.hpp"
 #include "src/mc/sosp/RegionSnapshot.hpp"
 
@@ -22,19 +23,21 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc, "Logging specific to regio
 namespace simgrid {
 namespace mc {
 
-RegionSnapshot* dense_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+RegionDense::RegionDense(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+    : RegionSnapshot(region_type, start_addr, permanent_addr, size)
 {
-  simgrid::mc::Buffer data = Buffer::malloc(size);
+  flat_data_ = Buffer::malloc(size);
 
-  mc_model_checker->process().read_bytes(data.get(), size, remote(permanent_addr), simgrid::mc::ProcessIndexDisabled);
+  mc_model_checker->process().read_bytes(flat_data_.get(), size, remote(permanent_addr),
+                                         simgrid::mc::ProcessIndexDisabled);
 
-  simgrid::mc::RegionSnapshot* region = new RegionSnapshot(region_type, start_addr, permanent_addr, size);
-  region->flat_data(std::move(data));
+  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" : "?")),
-            region->flat_data().get(), permanent_addr, size);
-  return region;
+            flat_data().get(), permanent_addr, size);
 }
 
 /** @brief Take a snapshot of a given region
@@ -48,12 +51,13 @@ RegionSnapshot* dense_region(RegionType region_type, void* start_addr, void* per
 RegionSnapshot* region(RegionType type, void* start_addr, void* permanent_addr, size_t size)
 {
   if (_sg_mc_sparse_checkpoint)
-    return sparse_region(type, start_addr, permanent_addr, size);
+    return new RegionSparse(type, start_addr, permanent_addr, size);
   else
-    return dense_region(type, start_addr, permanent_addr, size);
+    return new RegionDense(type, start_addr, permanent_addr, size);
 }
 
-RegionSnapshot* sparse_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+RegionSparse::RegionSparse(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+    : RegionSnapshot(region_type, start_addr, permanent_addr, size)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
   assert(process != nullptr);
@@ -61,15 +65,40 @@ RegionSnapshot* sparse_region(RegionType region_type, void* start_addr, void* pe
   xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize - 1)) == 0, "Start address not at the beginning of a page");
   xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize - 1)) == 0,
              "Permanent address not at the beginning of a page");
-  size_t page_count = simgrid::mc::mmu::chunk_count(size);
 
-  simgrid::mc::ChunkedData page_data(mc_model_checker->page_store(), *process, RemotePtr<void>(permanent_addr),
-                                     page_count);
+  storage_type_ = StorageType::Chunked;
+  flat_data_.clear();
+  privatized_regions_.clear();
 
-  simgrid::mc::RegionSnapshot* region = new RegionSnapshot(region_type, start_addr, permanent_addr, size);
-  region->page_data(std::move(page_data));
-  return region;
+  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)
+{
+  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();
+}
+#endif
+
 } // namespace mc
 } // namespace simgrid