X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/440ced834dc98975c18cf7130ae1d6d9018438db..f99825c9a9bf0ab802f611630da8cb18d3b90f23:/src/mc/mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 837b416293..2d04cb8672 100644
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -17,6 +17,10 @@
 #include "mc_private.h"
 #include "mc_smx.h"
 
+#include "mc/Frame.hpp"
+#include "mc/ObjectInformation.hpp"
+#include "mc/Variable.hpp"
+
 #ifdef HAVE_SMPI
 #include "smpi/private.h"
 #endif
@@ -104,11 +108,12 @@ static int compare_areas_with_type(struct mc_compare_state& state,
                                    int process_index,
                                    void* real_area1, mc_snapshot_t snapshot1, mc_mem_region_t region1,
                                    void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2,
-                                   mc_type_t type, int pointer_level)
+                                   simgrid::mc::Type* type, int pointer_level)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
 
-  mc_type_t subtype, subsubtype;
+  simgrid::mc::Type* subtype;
+  simgrid::mc::Type* subsubtype;
   int elm_size, i, res;
 
   top:
@@ -210,7 +215,7 @@ static int compare_areas_with_type(struct mc_compare_state& state,
       else if (region1->contain(simgrid::mc::remote(addr_pointed1))) {
         if (!region2->contain(simgrid::mc::remote(addr_pointed2)))
           return 1;
-        if (type->type_id.empty())
+        if (!type->type_id)
           return (addr_pointed1 != addr_pointed2);
         else {
           return compare_areas_with_type(state, process_index,
@@ -258,7 +263,7 @@ static int compare_areas_with_type(struct mc_compare_state& state,
   return 0;
 }
 
-static int compare_global_variables(mc_object_info_t object_info,
+static int compare_global_variables(simgrid::mc::ObjectInformation* object_info,
                                     int process_index,
                                     mc_mem_region_t r1,
                                     mc_mem_region_t r2, mc_snapshot_t snapshot1,
@@ -305,7 +310,7 @@ static int compare_global_variables(mc_object_info_t object_info,
         || (char *) current_var.address > (char *) object_info->end_rw)
       continue;
 
-    mc_type_t bvariable_type = current_var.type;
+    simgrid::mc::Type* bvariable_type = current_var.type;
     int res =
         compare_areas_with_type(state, process_index,
                                 (char *) current_var.address, snapshot1, r1,
@@ -359,7 +364,7 @@ static int compare_local_variables(int process_index,
       }
       // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
 
-        mc_type_t subtype = current_var1->type;
+        simgrid::mc::Type* subtype = current_var1->type;
         res =
             compare_areas_with_type(state, process_index,
                                     current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1, process_index),
@@ -386,7 +391,7 @@ static int compare_local_variables(int process_index,
 
 int snapshot_compare(void *state1, void *state2)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
 
   mc_snapshot_t s1, s2;
   int num1, num2;
@@ -584,7 +589,7 @@ int snapshot_compare(void *state1, void *state2)
     xbt_assert(region1->object_info() == region2->object_info());
     xbt_assert(region1->object_info());
 
-    const char* name = region1->object_info()->file_name;
+    std::string const& name = region1->object_info()->file_name;
 
 #ifdef MC_DEBUG
     if (is_diff == 0)
@@ -604,13 +609,13 @@ int snapshot_compare(void *state1, void *state2)
       xbt_os_walltimer_stop(timer);
       mc_comp_times->global_variables_comparison_time
         += xbt_os_timer_elapsed(timer);
-      XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2,
-                name);
+      XBT_DEBUG("(%d - %d) Different global variables in %s",
+        num1, num2, name.c_str());
       errors++;
 #else
 #ifdef MC_VERBOSE
-      XBT_VERB("(%d - %d) Different global variables in %s", num1, num2,
-               name);
+      XBT_VERB("(%d - %d) Different global variables in %s",
+        num1, num2, name.c_str());
 #endif
 
       reset_heap_information();