X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02a7d032779c8f37702c9513f1c3fbb988088677..928649fec04d89b678017ec4cadbc97e5ef901f5:/src/mc/mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 9887e55ac1..d9af408dfa 100644
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -268,30 +268,30 @@ static int compare_global_variables(mc_object_info_t object_info,
   xbt_assert(r1 && r2, "Missing region.");
 
 #ifdef HAVE_SMPI
-  if (r1->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+  if (r1->storage_type() == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
     xbt_assert(process_index >= 0);
-    if (r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+    if (r2->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED) {
       return 1;
     }
 
     size_t process_count = MC_smpi_process_count();
-    xbt_assert(process_count == r1->privatized_regions_.size()
-      && process_count == r2->privatized_regions_.size());
+    xbt_assert(process_count == r1->privatized_data().size()
+      && process_count == r2->privatized_data().size());
 
     // Compare the global variables separately for each simulates process:
     for (size_t process_index = 0; process_index < process_count; process_index++) {
       int is_diff = compare_global_variables(object_info, process_index,
-        r1->privatized_regions_[process_index].get(),
-        r2->privatized_regions_[process_index].get(),
+        &r1->privatized_data()[process_index],
+        &r2->privatized_data()[process_index],
         snapshot1, snapshot2);
       if (is_diff) return 1;
     }
     return 0;
   }
 #else
-  xbt_assert(r1->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED);
+  xbt_assert(r1->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED);
 #endif
-  xbt_assert(r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED);
+  xbt_assert(r2->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED);
 
   struct mc_compare_state state;
 
@@ -589,15 +589,14 @@ int snapshot_compare(void *state1, void *state2)
     mc_mem_region_t region2 = s2->snapshot_regions[k];
 
     // Preconditions:
-    if (region1->region_type != MC_REGION_TYPE_DATA)
+    if (region1->region_type() != MC_REGION_TYPE_DATA)
       continue;
 
-    xbt_assert(region1->region_type == region2->region_type);
-    xbt_assert(region1->object_info == region2->object_info);
+    xbt_assert(region1->region_type() == region2->region_type());
+    xbt_assert(region1->object_info() == region2->object_info());
+    xbt_assert(region1->object_info());
 
-    xbt_assert(region1->object_info);
-
-    const char* name = region1->object_info->file_name;
+    const char* name = region1->object_info()->file_name;
 
 #ifdef MC_DEBUG
     if (is_diff == 0)
@@ -607,7 +606,7 @@ int snapshot_compare(void *state1, void *state2)
 
     /* Compare global variables */
     is_diff =
-      compare_global_variables(region1->object_info, simgrid::mc::AddressSpace::Normal,
+      compare_global_variables(region1->object_info(  ), simgrid::mc::AddressSpace::Normal,
         region1, region2,
         s1, s2);