mc: Kill a C type and use the C++ one

+cosmetics

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 8babd98..7393aab 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -301,8 +301,7 @@ int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2,
 }
 
 // TODO, have a robust way to find it in O(1)
 }
 
 // TODO, have a robust way to find it in O(1)

-static inline
-mc_mem_region_t MC_get_heap_region(simgrid::mc::Snapshot* snapshot)
+static inline RegionSnapshot* MC_get_heap_region(Snapshot* snapshot)

 {
   for (auto const& region : snapshot->snapshot_regions)
     if (region->region_type() == simgrid::mc::RegionType::Heap)
 {
   for (auto const& region : snapshot->snapshot_regions)
     if (region->region_type() == simgrid::mc::RegionType::Heap)


@@ -328,8 +327,8 @@ int mmalloc_compare_heap(
   malloc_info heapinfo_temp2;
   malloc_info heapinfo_temp2b;
 
   malloc_info heapinfo_temp2;
   malloc_info heapinfo_temp2b;
 

-  mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
-  mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);

 
   // This is the address of std_heap->heapinfo in the application process:
   void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo;
 
   // This is the address of std_heap->heapinfo in the application process:
   void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo;


@@ -586,8 +585,8 @@ static int compare_heap_area_without_type(
   int check_ignore)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
   int check_ignore)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();

-  mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
-  mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);

 
   for (int i = 0; i < size; ) {
 
 
   for (int i = 0; i < size; ) {
 


@@ -696,8 +695,8 @@ static int compare_heap_area_with_type(
     const void* addr_pointed1;
     const void* addr_pointed2;
 
     const void* addr_pointed1;
     const void* addr_pointed2;
 

-    mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
-    mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+    simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+    simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);

 
     switch (type->type) {
       case DW_TAG_unspecified_type:
 
     switch (type->type) {
       case DW_TAG_unspecified_type:


@@ -987,8 +986,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index,
 
   }
 
 
   }
 

-  mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
-  mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);

 
   const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(
     heap_region1, &heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));
 
   const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(
     heap_region1, &heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));


@@ -1205,11 +1204,10 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index,
 /************************** Snapshot comparison *******************************/
 /******************************************************************************/
 
 /************************** Snapshot comparison *******************************/
 /******************************************************************************/
 

-static int compare_areas_with_type(simgrid::mc::StateComparator& state,
-                                   int process_index,
-                                   void* real_area1, simgrid::mc::Snapshot* snapshot1, mc_mem_region_t region1,
-                                   void* real_area2, simgrid::mc::Snapshot* snapshot2, mc_mem_region_t region2,
-                                   simgrid::mc::Type* type, int pointer_level)
+static int compare_areas_with_type(simgrid::mc::StateComparator& state, int process_index, void* real_area1,
+                                   simgrid::mc::Snapshot* snapshot1, simgrid::mc::RegionSnapshot* region1,
+                                   void* real_area2, simgrid::mc::Snapshot* snapshot2,
+                                   simgrid::mc::RegionSnapshot* region2, simgrid::mc::Type* type, int pointer_level)

 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
 
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
 


@@ -1323,8 +1321,8 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state,
         for (simgrid::mc::Member& member : type->members) {
           void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1, process_index);
           void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2, process_index);
         for (simgrid::mc::Member& member : type->members) {
           void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1, process_index);
           void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2, process_index);

-          mc_mem_region_t subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1);
-          mc_mem_region_t subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2);
+          simgrid::mc::RegionSnapshot* subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1);
+          simgrid::mc::RegionSnapshot* subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2);

           res = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2,
                                         subregion2, member.type, pointer_level);
           if (res == 1)
           res = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2,
                                         subregion2, member.type, pointer_level);
           if (res == 1)


@@ -1342,12 +1340,9 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state,
   } while (true);
 }
 
   } while (true);
 }
 

-static int compare_global_variables(
-  simgrid::mc::StateComparator& state,
-  simgrid::mc::ObjectInformation* object_info,
-  int process_index,
-  mc_mem_region_t r1, mc_mem_region_t r2,
-  simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2)
+static int compare_global_variables(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
+                                    int process_index, simgrid::mc::RegionSnapshot* r1, simgrid::mc::RegionSnapshot* r2,
+                                    simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2)

 {
   xbt_assert(r1 && r2, "Missing region.");
 
 {
   xbt_assert(r1 && r2, "Missing region.");
 


@@ -1459,7 +1454,7 @@ namespace mc {
 
 static std::unique_ptr<simgrid::mc::StateComparator> state_comparator;
 
 
 static std::unique_ptr<simgrid::mc::StateComparator> state_comparator;
 

-int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2)
+int snapshot_compare(int num1, Snapshot* s1, int num2, Snapshot* s2)

 {
   // TODO, make this a field of ModelChecker or something similar
 
 {
   // TODO, make this a field of ModelChecker or something similar
 


@@ -1468,7 +1463,7 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc:
   else
     state_comparator->clear();
 
   else
     state_comparator->clear();
 

-  simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+  RemoteClient* process = &mc_model_checker->process();

 
   int errors = 0;
 
 
   int errors = 0;
 


@@ -1569,11 +1564,11 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc:
   xbt_assert(regions_count == s2->snapshot_regions.size());
 
   for (size_t k = 0; k != regions_count; ++k) {
   xbt_assert(regions_count == s2->snapshot_regions.size());
 
   for (size_t k = 0; k != regions_count; ++k) {

-    mc_mem_region_t region1 = s1->snapshot_regions[k].get();
-    mc_mem_region_t region2 = s2->snapshot_regions[k].get();
+    RegionSnapshot* region1 = s1->snapshot_regions[k].get();
+    RegionSnapshot* region2 = s2->snapshot_regions[k].get();

 
     // Preconditions:
 
     // Preconditions:

-    if (region1->region_type() != simgrid::mc::RegionType::Data)
+    if (region1->region_type() != RegionType::Data)

       continue;
 
     xbt_assert(region1->region_type() == region2->region_type());
       continue;
 
     xbt_assert(region1->region_type() == region2->region_type());


@@ -1602,7 +1597,7 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc:
   }
 
   /* Compare heap */
   }
 
   /* Compare heap */

-  if (simgrid::mc::mmalloc_compare_heap(*state_comparator, s1, s2) > 0) {
+  if (mmalloc_compare_heap(*state_comparator, s1, s2) > 0) {

 
 #ifdef MC_DEBUG
     XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
 
 #ifdef MC_DEBUG
     XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);

diff --git a/src/mc/sosp/RegionSnapshot.hpp b/src/mc/sosp/RegionSnapshot.hpp
index d1011af..de4734a 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.hpp
+++ b/src/mc/sosp/RegionSnapshot.hpp
@@ -247,6 +247,4 @@ simgrid::mc::RegionSnapshot region(RegionType type, void* start_addr, void* data
 } // namespace mc
 } // namespace simgrid
 
 } // namespace mc
 } // namespace simgrid
 

-typedef simgrid::mc::RegionSnapshot s_mc_mem_region_t;
-typedef s_mc_mem_region_t* mc_mem_region_t;

 #endif
 #endif

diff --git a/src/mc/sosp/mc_checkpoint.cpp b/src/mc/sosp/mc_checkpoint.cpp
index 58a0bb9..0ae2a09 100644 (file)
--- a/src/mc/sosp/mc_checkpoint.cpp
+++ b/src/mc/sosp/mc_checkpoint.cpp
@@ -57,7 +57,7 @@ namespace mc {
  *
  *  @param region     Target region
  */
  *
  *  @param region     Target region
  */

-static void restore(mc_mem_region_t region)
+static void restore(RegionSnapshot* region)

 {
   switch (region->storage_type()) {
     case simgrid::mc::StorageType::Flat:
 {
   switch (region->storage_type()) {
     case simgrid::mc::StorageType::Flat:


@@ -445,7 +445,7 @@ std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
 
 static inline void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
 {
 
 static inline void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
 {

-  for (std::unique_ptr<s_mc_mem_region_t> const& region : snapshot->snapshot_regions) {
+  for (std::unique_ptr<simgrid::mc::RegionSnapshot> const& region : snapshot->snapshot_regions) {

     // For privatized, variables we decided it was not necessary to take the snapshot:
     if (region)
       restore(region.get());
     // For privatized, variables we decided it was not necessary to take the snapshot:
     if (region)
       restore(region.get());

diff --git a/src/mc/sosp/mc_page_snapshot.cpp b/src/mc/sosp/mc_page_snapshot.cpp
index c3994d1..a8e0640 100644 (file)
--- a/src/mc/sosp/mc_page_snapshot.cpp
+++ b/src/mc/sosp/mc_page_snapshot.cpp
@@ -39,7 +39,7 @@ void mc_restore_page_snapshot_region(simgrid::mc::RemoteClient* process, void* s
 
 // ***** High level API
 
 
 // ***** High level API
 

-void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, mc_mem_region_t reg)
+void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, simgrid::mc::RegionSnapshot* reg)

 {
   xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
   xbt_assert(simgrid::mc::mmu::chunkCount(reg->size()) == reg->page_data().page_count());
 {
   xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
   xbt_assert(simgrid::mc::mmu::chunkCount(reg->size()) == reg->page_data().page_count());

diff --git a/src/mc/sosp/mc_snapshot.cpp b/src/mc/sosp/mc_snapshot.cpp
index 34d2ee4..1678a59 100644 (file)
--- a/src/mc/sosp/mc_snapshot.cpp
+++ b/src/mc/sosp/mc_snapshot.cpp
@@ -25,11 +25,12 @@
  *  @param snapshot Snapshot
  *  @param process_index rank requesting the region
  * */
  *  @param snapshot Snapshot
  *  @param process_index rank requesting the region
  * */

-mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot, int process_index)
+simgrid::mc::RegionSnapshot* mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot,
+                                                    int process_index)

 {
   size_t n = snapshot->snapshot_regions.size();
   for (size_t i = 0; i != n; ++i) {
 {
   size_t n = snapshot->snapshot_regions.size();
   for (size_t i = 0; i != n; ++i) {

-    mc_mem_region_t region = snapshot->snapshot_regions[i].get();
+    simgrid::mc::RegionSnapshot* region = snapshot->snapshot_regions[i].get();

     if (not(region && region->contain(simgrid::mc::remote(addr))))
       continue;
 
     if (not(region && region->contain(simgrid::mc::remote(addr))))
       continue;
 


@@ -64,7 +65,7 @@ mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snap
  *  @param size    Size of the data to read in bytes
  *  @return Pointer where the data is located (target buffer of original location)
  */
  *  @param size    Size of the data to read in bytes
  *  @return Pointer where the data is located (target buffer of original location)
  */

-const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, const void* addr, size_t size)
+const void* MC_region_read_fragmented(simgrid::mc::RegionSnapshot* region, void* target, const void* addr, size_t size)

 {
   // Last byte of the memory area:
   void* end = (char*)addr + size - 1;
 {
   // Last byte of the memory area:
   void* end = (char*)addr + size - 1;


@@ -106,8 +107,8 @@ const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, cons
  * @param region2 Region of the address in the second snapshot
  * @return same semantic as memcmp
  */
  * @param region2 Region of the address in the second snapshot
  * @return same semantic as memcmp
  */

-int MC_snapshot_region_memcmp(const void* addr1, mc_mem_region_t region1, const void* addr2, mc_mem_region_t region2,
-                              size_t size)
+int MC_snapshot_region_memcmp(const void* addr1, simgrid::mc::RegionSnapshot* region1, const void* addr2,
+                              simgrid::mc::RegionSnapshot* region2, size_t size)

 {
   // Using alloca() for large allocations may trigger stack overflow:
   // use malloc if the buffer is too big.
 {
   // Using alloca() for large allocations may trigger stack overflow:
   // use malloc if the buffer is too big.


@@ -148,7 +149,7 @@ Snapshot::Snapshot(RemoteClient* process, int _num_state)
 const void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr<void> address, int process_index,
                                  ReadOptions options) const
 {
 const void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr<void> address, int process_index,
                                  ReadOptions options) const
 {

-  mc_mem_region_t region = mc_get_snapshot_region((void*)address.address(), this, process_index);
+  RegionSnapshot* region = mc_get_snapshot_region((void*)address.address(), this, process_index);

   if (region) {
     const void* res = MC_region_read(region, buffer, (void*)address.address(), size);
     if (buffer == res || options & ReadOptions::lazy())
   if (region) {
     const void* res = MC_region_read(region, buffer, (void*)address.address(), size);
     if (buffer == res || options & ReadOptions::lazy())

diff --git a/src/mc/sosp/mc_snapshot.hpp b/src/mc/sosp/mc_snapshot.hpp
index 692990c..785c76a 100644 (file)
--- a/src/mc/sosp/mc_snapshot.hpp
+++ b/src/mc/sosp/mc_snapshot.hpp
@@ -13,9 +13,9 @@
 
 // ***** Snapshot region
 
 
 // ***** Snapshot region
 

-XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, mc_mem_region_t reg);
+XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, simgrid::mc::RegionSnapshot* reg);

 
 

-static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
+static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, simgrid::mc::RegionSnapshot* region)

 {
   auto split                = simgrid::mc::mmu::split(addr - region->start().address());
   auto pageno               = split.first;
 {
   auto split                = simgrid::mc::mmu::split(addr - region->start().address());
   auto pageno               = split.first;


@@ -24,7 +24,8 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t add
   return (char*)snapshot_page + offset;
 }
 
   return (char*)snapshot_page + offset;
 }
 

-static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index)
+static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgrid::mc::RegionSnapshot* region,
+                                                           int process_index)

 {
   switch (region->storage_type()) {
     case simgrid::mc::StorageType::Flat: {
 {
   switch (region->storage_type()) {
     case simgrid::mc::StorageType::Flat: {


@@ -44,8 +45,8 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_me
   }
 }
 
   }
 }
 

-XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot,
-                                                   int process_index);
+XBT_PRIVATE simgrid::mc::RegionSnapshot* mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot,
+                                                                int process_index);

 
 // ***** MC Snapshot
 
 
 // ***** MC Snapshot
 


@@ -103,7 +104,7 @@ public:
   // To be private
   int num_state;
   std::size_t heap_bytes_used;
   // To be private
   int num_state;
   std::size_t heap_bytes_used;

-  std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
+  std::vector<std::unique_ptr<RegionSnapshot>> snapshot_regions;

   std::set<pid_t> enabled_processes;
   int privatization_index;
   std::vector<std::size_t> stack_sizes;
   std::set<pid_t> enabled_processes;
   int privatization_index;
   std::vector<std::size_t> stack_sizes;


@@ -115,8 +116,9 @@ public:
 } // namespace mc
 } // namespace simgrid
 
 } // namespace mc
 } // namespace simgrid
 

-static XBT_ALWAYS_INLINE mc_mem_region_t mc_get_region_hinted(void* addr, simgrid::mc::Snapshot* snapshot,
-                                                              int process_index, mc_mem_region_t region)
+static XBT_ALWAYS_INLINE simgrid::mc::RegionSnapshot* mc_get_region_hinted(void* addr, simgrid::mc::Snapshot* snapshot,
+                                                                           int process_index,
+                                                                           simgrid::mc::RegionSnapshot* region)

 {
   if (region->contain(simgrid::mc::remote(addr)))
     return region;
 {
   if (region->contain(simgrid::mc::remote(addr)))
     return region;


@@ -129,18 +131,19 @@ static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot);
 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {
 

-XBT_PRIVATE std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state);
-XBT_PRIVATE void restore_snapshot(std::shared_ptr<simgrid::mc::Snapshot> snapshot);
+XBT_PRIVATE std::shared_ptr<Snapshot> take_snapshot(int num_state);
+XBT_PRIVATE void restore_snapshot(std::shared_ptr<Snapshot> snapshot);

 } // namespace mc
 } // namespace simgrid
 
 XBT_PRIVATE void mc_restore_page_snapshot_region(simgrid::mc::RemoteClient* process, void* start_addr,
                                                  simgrid::mc::ChunkedData const& pagenos);
 
 } // namespace mc
 } // namespace simgrid
 
 XBT_PRIVATE void mc_restore_page_snapshot_region(simgrid::mc::RemoteClient* process, void* start_addr,
                                                  simgrid::mc::ChunkedData const& pagenos);
 

-const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, const void* addr, std::size_t size);
+const void* MC_region_read_fragmented(simgrid::mc::RegionSnapshot* region, void* target, const void* addr,
+                                      std::size_t size);

 
 

-int MC_snapshot_region_memcmp(const void* addr1, mc_mem_region_t region1, const void* addr2, mc_mem_region_t region2,
-                              std::size_t size);
+int MC_snapshot_region_memcmp(const void* addr1, simgrid::mc::RegionSnapshot* region1, const void* addr2,
+                              simgrid::mc::RegionSnapshot* region2, std::size_t size);

 
 static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot)
 {
 
 static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot)
 {


@@ -157,7 +160,7 @@ static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snaps
  *  @param size    Size of the data to read in bytes
  *  @return Pointer where the data is located (target buffer of original location)
  */
  *  @param size    Size of the data to read in bytes
  *  @return Pointer where the data is located (target buffer of original location)
  */

-static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr,
+static XBT_ALWAYS_INLINE const void* MC_region_read(simgrid::mc::RegionSnapshot* region, void* target, const void* addr,

                                                     std::size_t size)
 {
   xbt_assert(region);
                                                     std::size_t size)
 {
   xbt_assert(region);


@@ -188,7 +191,7 @@ static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void
   }
 }
 
   }
 }
 

-static XBT_ALWAYS_INLINE void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
+static XBT_ALWAYS_INLINE void* MC_region_read_pointer(simgrid::mc::RegionSnapshot* region, const void* addr)

 {
   void* res;
   return *(void**)MC_region_read(region, &res, addr, sizeof(void*));
 {
   void* res;
   return *(void**)MC_region_read(region, &res, addr, sizeof(void*));