X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39cf43e4e190f5053b971b13ff1a1d82ebea5dba..fd258c3515ea40e87b56705c9b35a9bb86547a23:/src/mc/compare.cpp

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 8525202ddf..e4eb505635 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -8,7 +8,7 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/sosp/mc_snapshot.hpp"
+#include "src/mc/sosp/Snapshot.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc");
 
@@ -268,7 +268,7 @@ int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2,
 }
 
 // TODO, have a robust way to find it in O(1)
-static inline RegionSnapshot* MC_get_heap_region(Snapshot* snapshot)
+static inline Region* MC_get_heap_region(Snapshot* snapshot)
 {
   for (auto const& region : snapshot->snapshot_regions_)
     if (region->region_type() == simgrid::mc::RegionType::Heap)
@@ -294,8 +294,8 @@ int mmalloc_compare_heap(
   malloc_info heapinfo_temp2;
   malloc_info heapinfo_temp2b;
 
-  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
-  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
+  simgrid::mc::Region* 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;
@@ -308,8 +308,10 @@ int mmalloc_compare_heap(
 
   while (i1 < state.heaplimit) {
 
-    const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info));
-    const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info));
+    const malloc_info* heapinfo1 =
+        (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info));
+    const malloc_info* heapinfo2 =
+        (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info));
 
     if (heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type == MMALLOC_TYPE_HEAPINFO) {      /* Free block */
       i1 ++;
@@ -365,7 +367,8 @@ int mmalloc_compare_heap(
           continue;
         }
 
-        const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read(heap_region2, &heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info));
+        const malloc_info* heapinfo2b =
+            (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info));
 
         if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) {
           i2++;
@@ -423,9 +426,8 @@ int mmalloc_compare_heap(
 
         while (i2 < state.heaplimit && not equal) {
 
-          const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read(
-            heap_region2, &heapinfo_temp2b, &heapinfos2[i2],
-            sizeof(malloc_info));
+          const malloc_info* heapinfo2b =
+              (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info));
 
           if (heapinfo2b->type == MMALLOC_TYPE_FREE || heapinfo2b->type == MMALLOC_TYPE_HEAPINFO) {
             i2 ++;
@@ -480,8 +482,8 @@ int mmalloc_compare_heap(
 
   /* All blocks/fragments are equal to another block/fragment_ ? */
   for (size_t i = 1; i < state.heaplimit; i++) {
-    const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(
-      heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info));
+    const malloc_info* heapinfo1 =
+        (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info));
 
     if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo1->busy_block.busy_size > 0 &&
         not state.equals_to1_(i, 0).valid_) {
@@ -502,8 +504,8 @@ int mmalloc_compare_heap(
     XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1);
 
   for (size_t i = 1; i < state.heaplimit; i++) {
-    const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(
-      heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info));
+    const malloc_info* heapinfo2 =
+        (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info));
     if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo2->busy_block.busy_size > 0 &&
         not state.equals_to2_(i, 0).valid_) {
       XBT_DEBUG("Block %zu not found (size used = %zu)", i,
@@ -546,8 +548,8 @@ static int compare_heap_area_without_type(simgrid::mc::StateComparator& state, c
                                           int check_ignore)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
-  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
-  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::Region* heap_region1  = MC_get_heap_region(snapshot1);
+  simgrid::mc::Region* heap_region2  = MC_get_heap_region(snapshot2);
 
   for (int i = 0; i < size; ) {
 
@@ -649,8 +651,8 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons
     const void* addr_pointed1;
     const void* addr_pointed2;
 
-    simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
-    simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
+    simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
+    simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2);
 
     switch (type->type) {
       case DW_TAG_unspecified_type:
@@ -935,13 +937,13 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar
 
   }
 
-  simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
-  simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
+  simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
+  simgrid::mc::Region* 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* heapinfo2 = (const malloc_info*) MC_region_read(
-    heap_region2, &heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info));
+  const malloc_info* heapinfo1 =
+      (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));
+  const malloc_info* heapinfo2 =
+      (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info));
 
   if ((heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type==MMALLOC_TYPE_HEAPINFO)
     && (heapinfo2->type == MMALLOC_TYPE_FREE || heapinfo2->type ==MMALLOC_TYPE_HEAPINFO)) {
@@ -1148,9 +1150,9 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar
 /******************************************************************************/
 
 static int compare_areas_with_type(simgrid::mc::StateComparator& state, 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::Snapshot* snapshot1, simgrid::mc::Region* region1, void* real_area2,
+                                   simgrid::mc::Snapshot* snapshot2, simgrid::mc::Region* region2,
+                                   simgrid::mc::Type* type, int pointer_level)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
 
@@ -1264,8 +1266,8 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re
         for (simgrid::mc::Member& member : type->members) {
           void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1);
           void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2);
-          simgrid::mc::RegionSnapshot* subregion1 = snapshot1->get_region(member1, region1); // region1 is hinted
-          simgrid::mc::RegionSnapshot* subregion2 = snapshot2->get_region(member2, region2); // region2 is hinted
+          simgrid::mc::Region* subregion1 = snapshot1->get_region(member1, region1); // region1 is hinted
+          simgrid::mc::Region* subregion2 = snapshot2->get_region(member2, region2); // region2 is hinted
           res = compare_areas_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2,
                                         member.type, pointer_level);
           if (res == 1)
@@ -1284,8 +1286,8 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re
 }
 
 static int compare_global_variables(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
-                                    simgrid::mc::RegionSnapshot* r1, simgrid::mc::RegionSnapshot* r2,
-                                    simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2)
+                                    simgrid::mc::Region* r1, simgrid::mc::Region* r2, simgrid::mc::Snapshot* snapshot1,
+                                    simgrid::mc::Snapshot* snapshot2)
 {
   xbt_assert(r1 && r2, "Missing region.");
 
@@ -1471,8 +1473,8 @@ int snapshot_compare(Snapshot* s1, Snapshot* s2)
   xbt_assert(regions_count == s2->snapshot_regions_.size());
 
   for (size_t k = 0; k != regions_count; ++k) {
-    RegionSnapshot* region1 = s1->snapshot_regions_[k].get();
-    RegionSnapshot* region2 = s2->snapshot_regions_[k].get();
+    Region* region1 = s1->snapshot_regions_[k].get();
+    Region* region2 = s2->snapshot_regions_[k].get();
 
     // Preconditions:
     if (region1->region_type() != RegionType::Data)