[mc] Make Snapshot::snapshot_regions a std::vector

[simgrid.git] / src / mc / mc_snapshot.cpp

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 21cfc7b..0fdb7a1 100644 (file)
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -26,13 +26,13 @@ extern "C" {
 mc_mem_region_t mc_get_snapshot_region(
   const void* addr, const s_mc_snapshot_t* snapshot, int process_index)
 {
-  size_t n = snapshot->snapshot_regions_count;
+  size_t n = snapshot->snapshot_regions.size();
   for (size_t i = 0; i != n; ++i) {
-    mc_mem_region_t region = snapshot->snapshot_regions[i];
-    if (!(region && mc_region_contain(region, addr)))
+    mc_mem_region_t region = snapshot->snapshot_regions[i].get();
+    if (!(region && region->contain(simgrid::mc::remote(addr))))
       continue;
 
-    if (region->storage_type() == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+    if (region->storage_type() == simgrid::mc::StorageType::Privatized) {
 #ifdef HAVE_SMPI
       // Use the current process index of the snapshot:
       if (process_index == simgrid::mc::ProcessIndexDisabled) {
@@ -45,7 +45,7 @@ mc_mem_region_t mc_get_snapshot_region(
         xbt_die("Invalid process index");
       }
       simgrid::mc::RegionSnapshot& priv_region = region->privatized_data()[process_index];
-      xbt_assert(mc_region_contain(&priv_region, addr));
+      xbt_assert(priv_region.contain(simgrid::mc::remote(addr)));
       return &priv_region;
 #else
       xbt_die("Privatized region in a non SMPI build (this should not happen)");
@@ -114,8 +114,8 @@ int MC_snapshot_region_memcmp(
   // Using alloca() for large allocations may trigger stack overflow:
   // use malloc if the buffer is too big.
   bool stack_alloc = size < 64;
-  const bool region1_need_buffer = region1==NULL || region1->storage_type()==MC_REGION_STORAGE_TYPE_FLAT;
-  const bool region2_need_buffer = region2==NULL || region2->storage_type()==MC_REGION_STORAGE_TYPE_FLAT;
+  const bool region1_need_buffer = region1==NULL || region1->storage_type()==simgrid::mc::StorageType::Flat;
+  const bool region2_need_buffer = region2==NULL || region2->storage_type()==simgrid::mc::StorageType::Flat;
   void* buffer1a = region1_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
   void* buffer2a = region2_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
   const void* buffer1 = MC_region_read(region1, buffer1a, addr1, size);
@@ -157,30 +157,18 @@ Snapshot::Snapshot() :
   process(nullptr),
   num_state(0),
   heap_bytes_used(0),
-  snapshot_regions(nullptr),
-  snapshot_regions_count(0),
-  enabled_processes(0),
+  enabled_processes(),
   privatization_index(0),
-  stack_sizes(nullptr),
+  stack_sizes(),
   stacks(nullptr),
-  to_ignore(nullptr),
-  hash(0),
-  ignored_data(nullptr),
-  total_fd(0),
-  current_fd(nullptr)
+  hash(0)
 {
 
 }
+
 Snapshot::~Snapshot()
 {
-  for (size_t i = 0; i < this->snapshot_regions_count; i++) {
-    delete this->snapshot_regions[i];
-  }
-  xbt_free(this->snapshot_regions);
-  xbt_free(this->stack_sizes);
   xbt_dynar_free(&(this->stacks));
-  xbt_dynar_free(&(this->to_ignore));
-  xbt_dynar_free(&this->ignored_data);
 }
 
 const void* Snapshot::read_bytes(void* buffer, std::size_t size,
@@ -256,13 +244,13 @@ static void test_snapshot(bool sparse_checkpoint) {
 
     // Init memory and take snapshots:
     init_memory(source, byte_size);
-    simgrid::mc::RegionSnapshot region0 = MC_region_sparse(
-      MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+    simgrid::mc::RegionSnapshot region0 = simgrid::mc::sparse_region(
+      simgrid::mc::RegionType::Unknown, source, source, byte_size);
     for(int i=0; i<n; i+=2) {
       init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
     }
-    simgrid::mc::RegionSnapshot region = MC_region_sparse(
-      MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+    simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
+      simgrid::mc::RegionType::Unknown, source, source, byte_size);
 
     void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
     xbt_assert(source!=MAP_FAILED, "Could not allocate destination memory");
@@ -296,8 +284,8 @@ static void test_snapshot(bool sparse_checkpoint) {
     if (n==1) {
       xbt_test_add("Read pointer for %i page(s)", n);
       memcpy(source, &mc_model_checker, sizeof(void*));
-      simgrid::mc::RegionSnapshot region2 = MC_region_sparse(
-        MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+      simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
+        simgrid::mc::RegionType::Unknown, source, source, byte_size);
       xbt_test_assert(MC_region_read_pointer(&region2, source) == mc_model_checker,
         "Mismtach in MC_region_read_pointer()");
     }