[mc] C++ify RegionType, StorageType enums

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

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 7940e39..77bbfd6 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -75,54 +75,8 @@ static void local_variable_free_voidp(void *v)
 
 }
 
-namespace simgrid {
-namespace mc {
-
-RegionSnapshot::~RegionSnapshot() {}
-
-}
-}
-
-/*******************************  Snapshot regions ********************************/
-/*********************************************************************************/
-
 extern "C" {
 
-static simgrid::mc::RegionSnapshot MC_region_dense(
-  mc_region_type_t region_type,
-  void *start_addr, void* permanent_addr, size_t size)
-{
-  std::vector<char> data(size);
-  mc_model_checker->process().read_bytes(data.data(), size,
-    remote(permanent_addr),
-    simgrid::mc::ProcessIndexDisabled);
-
-  simgrid::mc::RegionSnapshot region(
-    region_type, start_addr, permanent_addr, size);
-  region.flat_data(std::move(data));
-
-  XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu",
-            region_type, region.flat_data().data(), permanent_addr, size);
-  return std::move(region);
-}
-
-/** @brief Take a snapshot of a given region
- *
- * @param type
- * @param start_addr   Address of the region in the simulated process
- * @param permanent_addr Permanent address of this data (for privatized variables, this is the virtual address of the privatized mapping)
- * @param size         Size of the data*
- */
-static simgrid::mc::RegionSnapshot MC_region(
-  mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size)
-{
-  if (_sg_mc_sparse_checkpoint) {
-    return MC_region_sparse(type, start_addr, permanent_addr, size);
-  } else  {
-    return MC_region_dense(type, start_addr, permanent_addr, size);
-  }
-}
-
 /** @brief Restore a region from a snapshot
  *
  *  @param reg     Target region
@@ -130,29 +84,34 @@ static simgrid::mc::RegionSnapshot MC_region(
 static void MC_region_restore(mc_mem_region_t region)
 {
   switch(region->storage_type()) {
-  case MC_REGION_STORAGE_TYPE_NONE:
+  case simgrid::mc::StorageType::NoData:
   default:
     xbt_die("Storage type not supported");
     break;
 
-  case MC_REGION_STORAGE_TYPE_FLAT:
+  case simgrid::mc::StorageType::Flat:
     mc_model_checker->process().write_bytes(region->flat_data().data(),
       region->size(), region->permanent_address());
     break;
 
-  case MC_REGION_STORAGE_TYPE_CHUNKED:
+  case simgrid::mc::StorageType::Chunked:
     mc_region_restore_sparse(&mc_model_checker->process(), region);
     break;
 
-  case MC_REGION_STORAGE_TYPE_PRIVATIZED:
+  case simgrid::mc::StorageType::Privatized:
     for (auto& p : region->privatized_data())
       MC_region_restore(&p);
     break;
   }
 }
 
-static simgrid::mc::RegionSnapshot MC_region_privatized(
-    mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
+}
+
+namespace simgrid {
+namespace mc {
+
+simgrid::mc::RegionSnapshot privatized_region(
+    RegionType region_type, void *start_addr, void* permanent_addr, size_t size
     )
 {
   size_t process_count = MC_smpi_process_count();
@@ -171,7 +130,7 @@ static simgrid::mc::RegionSnapshot MC_region_privatized(
   data.reserve(process_count);
   for (size_t i = 0; i < process_count; i++)
     data.push_back(
-      MC_region(region_type, start_addr,
+      simgrid::mc::region(region_type, start_addr,
         privatisation_regions[i].address, size)
       );
 
@@ -181,22 +140,28 @@ static simgrid::mc::RegionSnapshot MC_region_privatized(
   return std::move(region);
 }
 
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
+}
+}
+
+extern "C" {
+
+static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
+                                  simgrid::mc::RegionType type,
                                   mc_object_info_t object_info,
                                   void *start_addr, void* permanent_addr, size_t size)
 {
-  if (type == MC_REGION_TYPE_DATA)
+  if (type == simgrid::mc::RegionType::Data)
     xbt_assert(object_info, "Missing object info for object.");
-  else if (type == MC_REGION_TYPE_HEAP)
+  else if (type == simgrid::mc::RegionType::Heap)
     xbt_assert(!object_info, "Unexpected object info for heap region.");
 
   const bool privatization_aware = MC_object_info_is_privatized(object_info);
 
   simgrid::mc::RegionSnapshot region;
   if (privatization_aware && MC_smpi_process_count())
-    region = MC_region_privatized(type, start_addr, permanent_addr, size);
+    region = simgrid::mc::privatized_region(type, start_addr, permanent_addr, size);
   else
-    region = MC_region(type, start_addr, permanent_addr, size);
+    region = simgrid::mc::region(type, start_addr, permanent_addr, size);
 
   region.object_info(object_info);
   snapshot->snapshot_regions[index]
@@ -212,7 +177,7 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot)
 
   for (size_t i = 0; i!=n; ++i) {
     mc_object_info_t object_info = process->object_infos[i];
-    MC_snapshot_add_region(i, snapshot, MC_REGION_TYPE_DATA, object_info,
+    MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data, object_info,
       object_info->start_rw, object_info->start_rw,
       object_info->end_rw - object_info->start_rw);
   }
@@ -221,7 +186,7 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot)
   void *start_heap = heap->base;
   void *end_heap = heap->breakval;
 
-  MC_snapshot_add_region(n, snapshot, MC_REGION_TYPE_HEAP, NULL,
+  MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,
                         start_heap, start_heap,
                         (char *) end_heap - (char *) start_heap);
   snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(