X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e25984db80c73093c3e6ecf7cf4034f27e9b026c..2e501076bf39bf43b598954f040b453fedf49f4c:/src/mc/mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 174b889644..ed0d50e18d 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
@@ -6,110 +6,85 @@
 
 #define __STDC_FORMAT_MACROS
 #include <cinttypes>
-#include <boost/unordered_set.hpp>
+
+#include <utility>
+#include <unordered_set>
 
 #include <xbt/sysdep.h>
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "mc_object_info.h"
 #include "mc_safety.h"
 #include "mc_liveness.h"
 #include "mc_private.h"
 #include "mc_smx.h"
+#include "mc_dwarf.hpp"
+
+#include "src/mc/Frame.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 #ifdef HAVE_SMPI
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 #endif
 
 #include "xbt/mmalloc.h"
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 
-#include <xbt/probes.h>
+#include "src/xbt/probes.h"
 
 using simgrid::mc::remote;
 
-typedef struct s_pointers_pair {
-  void *p1;
-  void *p2;
-  bool operator==(s_pointers_pair const& x) const {
-    return this->p1 == x.p1 && this->p2 == x.p2;
-  }
-  bool operator<(s_pointers_pair const& x) const {
-    return this->p1 < x.p1 || (this->p1 == x.p1 && this->p2 < x.p2);
-  }
-} s_pointers_pair_t, *pointers_pair_t;
-
-namespace boost {
-  template<>
-  struct hash<s_pointers_pair> {
-    typedef uintptr_t result_type;
-    result_type operator()(s_pointers_pair const& x) const {
-      return (result_type) x.p1 ^
-        ((result_type) x.p2 << 8 | (result_type) x.p2 >> (8*sizeof(uintptr_t) - 8));
-    }
-  };
-}
-
-struct mc_compare_state {
-  boost::unordered_set<s_pointers_pair> compared_pointers;
-};
-
 extern "C" {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt,
                                 "Logging specific to mc_compare in mc");
 
-/************************** Free functions ****************************/
-/********************************************************************/
+}
 
-static void stack_region_free(stack_region_t s)
-{
-  if (s) {
-    xbt_free(s);
+namespace simgrid {
+namespace mc {
+
+/** A hash which works with more stuff
+ *
+ *  It can hash pairs: the standard hash currently doesn't include this.
+ */
+template<class X> struct hash : public std::hash<X> {};
+
+template<class X, class Y>
+struct hash<std::pair<X,Y>> {
+  std::size_t operator()(std::pair<X,Y>const& x) const
+  {
+    struct hash<X> h1;
+    struct hash<X> h2;
+    return h1(x.first) ^ h2(x.second);
   }
-}
+};
 
-static void stack_region_free_voidp(void *s)
-{
-  stack_region_free((stack_region_t) * (void **) s);
-}
+struct ComparisonState {
+  std::unordered_set<std::pair<void*, void*>, hash<std::pair<void*, void*>>> compared_pointers;
+};
 
-static void pointers_pair_free(pointers_pair_t p)
-{
-  xbt_free(p);
 }
-
-static void pointers_pair_free_voidp(void *p)
-{
-  pointers_pair_free((pointers_pair_t) * (void **) p);
 }
 
+using simgrid::mc::ComparisonState;
+
+extern "C" {
+
 /************************** Snapshot comparison *******************************/
 /******************************************************************************/
 
-/** \brief Try to add a pair a compared pointers to the set of compared pointers
- *
- *  \result !=0 if the pointers were added (they were not in the set),
- *      0 otherwise (they were already in the set)
- */
-static int add_compared_pointers(mc_compare_state& state, void *p1, void *p2)
-{
-  s_pointers_pair_t new_pair;
-  new_pair.p1 = p1;
-  new_pair.p2 = p2;
-  return state.compared_pointers.insert(new_pair).second ? 1 : 0;
-}
-
-static int compare_areas_with_type(struct mc_compare_state& state,
+static int compare_areas_with_type(ComparisonState& 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,
-                                   dw_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();
 
-  unsigned int cursor = 0;
-  dw_type_t member, subtype, subsubtype;
+  simgrid::mc::Type* subtype;
+  simgrid::mc::Type* subsubtype;
   int elm_size, i, res;
 
   top:
@@ -186,7 +161,8 @@ static int compare_areas_with_type(struct mc_compare_state& state,
         return 0;
       if (addr_pointed1 == NULL || addr_pointed2 == NULL)
         return 1;
-      if (!add_compared_pointers(state, addr_pointed1, addr_pointed2))
+      if (!state.compared_pointers.insert(
+          std::make_pair(addr_pointed1, addr_pointed2)).second)
         return 0;
 
       pointer_level++;
@@ -208,10 +184,10 @@ static int compare_areas_with_type(struct mc_compare_state& state,
       }
 
       // The pointers are both in the current object R/W segment:
-      else if (mc_region_contain(region1, addr_pointed1)) {
-        if (!mc_region_contain(region2, addr_pointed2))
+      else if (region1->contain(simgrid::mc::remote(addr_pointed1))) {
+        if (!region2->contain(simgrid::mc::remote(addr_pointed2)))
           return 1;
-        if (type->dw_type_id == NULL)
+        if (!type->type_id)
           return (addr_pointed1 != addr_pointed2);
         else {
           return compare_areas_with_type(state, process_index,
@@ -232,18 +208,18 @@ static int compare_areas_with_type(struct mc_compare_state& state,
   }
   case DW_TAG_structure_type:
   case DW_TAG_class_type:
-    xbt_dynar_foreach(type->members, cursor, member) {
-      void *member1 =
-        mc_member_resolve(real_area1, type, member, snapshot1, process_index);
-      void *member2 =
-        mc_member_resolve(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);
       res =
           compare_areas_with_type(state, process_index,
                                   member1, snapshot1, subregion1,
                                   member2, snapshot2, subregion2,
-                                  member->subtype, pointer_level);
+                                  member.type, pointer_level);
       if (res == 1)
         return res;
     }
@@ -259,7 +235,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,
@@ -293,34 +269,30 @@ static int compare_global_variables(mc_object_info_t object_info,
 #endif
   xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized);
 
-  struct mc_compare_state state;
-
-  xbt_dynar_t variables;
-  int res;
-  unsigned int cursor = 0;
-  dw_variable_t current_var;
+  ComparisonState state;
 
-  variables = object_info->global_variables;
+  std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
 
-  xbt_dynar_foreach(variables, cursor, current_var) {
+  for (simgrid::mc::Variable& current_var : variables) {
 
     // If the variable is not in this object, skip it:
     // We do not expect to find a pointer to something which is not reachable
     // by the global variables.
-    if ((char *) current_var->address < (char *) object_info->start_rw
-        || (char *) current_var->address > (char *) object_info->end_rw)
+    if ((char *) current_var.address < (char *) object_info->start_rw
+        || (char *) current_var.address > (char *) object_info->end_rw)
       continue;
 
-    dw_type_t bvariable_type = current_var->type;
-    res =
+    simgrid::mc::Type* bvariable_type = current_var.type;
+    int res =
         compare_areas_with_type(state, process_index,
-                                (char *) current_var->address, snapshot1, r1,
-                                (char *) current_var->address, snapshot2, r2,
+                                (char *) current_var.address, snapshot1, r1,
+                                (char *) current_var.address, snapshot2, r2,
                                 bvariable_type, 0);
     if (res == 1) {
       XBT_TRACE3(mc, global_diff, -1, -1, current_var->name);
       XBT_VERB("Global variable %s (%p) is different between snapshots",
-               current_var->name, (char *) current_var->address);
+               current_var.name.c_str(),
+               (char *) current_var.address);
       return 1;
     }
 
@@ -336,37 +308,35 @@ static int compare_local_variables(int process_index,
                                    mc_snapshot_stack_t stack1,
                                    mc_snapshot_stack_t stack2)
 {
-  struct mc_compare_state state;
+  ComparisonState state;
 
-  if (xbt_dynar_length(stack1->local_variables) !=
-      xbt_dynar_length(stack2->local_variables)) {
+  if (stack1->local_variables.size() != stack2->local_variables.size()) {
     XBT_VERB("Different number of local variables");
     return 1;
   } else {
     unsigned int cursor = 0;
     local_variable_t current_var1, current_var2;
     int res;
-    while (cursor < xbt_dynar_length(stack1->local_variables)) {
-      current_var1 =
-          (local_variable_t) xbt_dynar_get_as(stack1->local_variables, cursor,
-                                              local_variable_t);
-      current_var2 =
-          (local_variable_t) xbt_dynar_get_as(stack2->local_variables, cursor,
-                                              local_variable_t);
-      if (strcmp(current_var1->name, current_var2->name) != 0
+    while (cursor < stack1->local_variables.size()) {
+      current_var1 = &stack1->local_variables[cursor];
+      current_var2 = &stack1->local_variables[cursor];
+      if (current_var1->name != current_var2->name
           || current_var1->subprogram != current_var1->subprogram
           || current_var1->ip != current_var2->ip) {
         // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
         XBT_VERB
-            ("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)",
-             current_var1->name, current_var2->name,
-             current_var1->subprogram->name, current_var2->subprogram->name,
+            ("Different name of variable (%s - %s) "
+             "or frame (%s - %s) or ip (%lu - %lu)",
+             current_var1->name.c_str(),
+             current_var2->name.c_str(),
+             current_var1->subprogram->name.c_str(),
+             current_var2->subprogram->name.c_str(),
              current_var1->ip, current_var2->ip);
         return 1;
       }
       // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
 
-        dw_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),
@@ -377,9 +347,12 @@ static int compare_local_variables(int process_index,
         // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
         XBT_TRACE3(mc, local_diff, -1, -1, current_var1->name);
         XBT_VERB
-            ("Local variable %s (%p - %p) in frame %s  is different between snapshots",
-             current_var1->name, current_var1->address, current_var2->address,
-             current_var1->subprogram->name);
+            ("Local variable %s (%p - %p) in frame %s "
+             "is different between snapshots",
+             current_var1->name.c_str(),
+             current_var1->address,
+             current_var2->address,
+             current_var1->subprogram->name.c_str());
         return res;
       }
       cursor++;
@@ -390,7 +363,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;
@@ -415,15 +388,6 @@ int snapshot_compare(void *state1, void *state2)
   int errors = 0;
   int res_init;
 
-  xbt_os_timer_t global_timer = xbt_os_timer_new();
-  xbt_os_timer_t timer = xbt_os_timer_new();
-
-  xbt_os_walltimer_start(global_timer);
-
-#ifdef MC_DEBUG
-  xbt_os_walltimer_start(timer);
-#endif
-
   int hash_result = 0;
   if (_sg_mc_hash) {
     hash_result = (s1->hash != s2->hash);
@@ -440,14 +404,10 @@ int snapshot_compare(void *state1, void *state2)
   }
 
   /* Compare enabled processes */
-  unsigned int cursor;
-  int pid;
-  xbt_dynar_foreach(s1->enabled_processes, cursor, pid){
-    if(!xbt_dynar_member(s2->enabled_processes, &pid)) {
+  if (s1->enabled_processes != s2->enabled_processes) {
       //XBT_TRACE3(mc, state_diff, num1, num2, "Different enabled processes");
       XBT_VERB("(%d - %d) Different enabled processes", num1, num2);
       // return 1; ??
-    }
   }
 
   unsigned long i = 0;
@@ -455,16 +415,11 @@ int snapshot_compare(void *state1, void *state2)
   int is_diff = 0;
 
   /* Compare size of stacks */
-  while (i < xbt_dynar_length(s1->stacks)) {
+  while (i < s1->stacks.size()) {
     size_used1 = s1->stack_sizes[i];
     size_used2 = s2->stack_sizes[i];
     if (size_used1 != size_used2) {
 #ifdef MC_DEBUG
-      if (is_diff == 0) {
-        xbt_os_walltimer_stop(timer);
-        mc_comp_times->stacks_sizes_comparison_time =
-            xbt_os_timer_elapsed(timer);
-      }
       XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1,
                 num2, size_used1, size_used2);
       errors++;
@@ -475,25 +430,12 @@ int snapshot_compare(void *state1, void *state2)
                num2, size_used1, size_used2);
 #endif
       XBT_TRACE3(mc, state_diff, num1, num2, "Different stack size");
-
-      xbt_os_walltimer_stop(timer);
-      xbt_os_timer_free(timer);
-      xbt_os_walltimer_stop(global_timer);
-      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-      xbt_os_timer_free(global_timer);
-
       return 1;
 #endif
     }
     i++;
   }
 
-#ifdef MC_DEBUG
-  if (is_diff == 0)
-    xbt_os_walltimer_stop(timer);
-  xbt_os_walltimer_start(timer);
-#endif
-
   /* Init heap information used in heap comparison algorithm */
   xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(
     alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
@@ -503,7 +445,7 @@ int snapshot_compare(void *state1, void *state2)
     alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
     remote(process->heap_address),
     simgrid::mc::ProcessIndexMissing, simgrid::mc::AddressSpace::Lazy);
-  res_init = init_heap_information(heap1, heap2, s1->to_ignore, s2->to_ignore);
+  res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
   if (res_init == -1) {
 #ifdef MC_DEBUG
     XBT_DEBUG("(%d - %d) Different heap information", num1, num2);
@@ -514,31 +456,20 @@ int snapshot_compare(void *state1, void *state2)
     XBT_VERB("(%d - %d) Different heap information", num1, num2);
 #endif
 
-    xbt_os_walltimer_stop(global_timer);
-    mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-    xbt_os_timer_free(global_timer);
-
     return 1;
 #endif
   }
-#ifdef MC_DEBUG
-  xbt_os_walltimer_start(timer);
-#endif
 
   /* Stacks comparison */
-  cursor = 0;
+  unsigned cursor = 0;
   int diff_local = 0;
 #ifdef MC_DEBUG
   is_diff = 0;
 #endif
   mc_snapshot_stack_t stack1, stack2;
-  while (cursor < xbt_dynar_length(s1->stacks)) {
-    stack1 =
-        (mc_snapshot_stack_t) xbt_dynar_get_as(s1->stacks, cursor,
-                                               mc_snapshot_stack_t);
-    stack2 =
-        (mc_snapshot_stack_t) xbt_dynar_get_as(s2->stacks, cursor,
-                                               mc_snapshot_stack_t);
+  while (cursor < s1->stacks.size()) {
+    stack1 = &s1->stacks[cursor];
+    stack2 = &s1->stacks[cursor];
 
     if (stack1->process_index != stack2->process_index) {
       diff_local = 1;
@@ -550,10 +481,6 @@ int snapshot_compare(void *state1, void *state2)
     if (diff_local > 0) {
       XBT_TRACE3(mc, state_diff, num1, num2, "Different local variables");
 #ifdef MC_DEBUG
-      if (is_diff == 0) {
-        xbt_os_walltimer_stop(timer);
-        mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer);
-      }
       XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1,
                 num2, cursor + 1);
       errors++;
@@ -566,11 +493,6 @@ int snapshot_compare(void *state1, void *state2)
 #endif
 
       reset_heap_information();
-      xbt_os_walltimer_stop(timer);
-      xbt_os_timer_free(timer);
-      xbt_os_walltimer_stop(global_timer);
-      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-      xbt_os_timer_free(global_timer);
 
       return 1;
 #endif
@@ -578,15 +500,13 @@ int snapshot_compare(void *state1, void *state2)
     cursor++;
   }
 
-  size_t regions_count = s1->snapshot_regions_count;
+  size_t regions_count = s1->snapshot_regions.size();
   // TODO, raise a difference instead?
-  xbt_assert(regions_count == s2->snapshot_regions_count);
-
-  mc_comp_times->global_variables_comparison_time = 0;
+  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];
-    mc_mem_region_t region2 = s2->snapshot_regions[k];
+    mc_mem_region_t region1 = s1->snapshot_regions[k].get();
+    mc_mem_region_t region2 = s2->snapshot_regions[k].get();
 
     // Preconditions:
     if (region1->region_type() != simgrid::mc::RegionType::Data)
@@ -596,13 +516,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;
-
-#ifdef MC_DEBUG
-    if (is_diff == 0)
-      xbt_os_walltimer_stop(timer);
-    xbt_os_walltimer_start(timer);
-#endif
+    std::string const& name = region1->object_info()->file_name;
 
     /* Compare global variables */
     is_diff =
@@ -613,41 +527,25 @@ int snapshot_compare(void *state1, void *state2)
     if (is_diff != 0) {
       XBT_TRACE3(mc, state_diff, num1, num2, "Different global variables");
 #ifdef MC_DEBUG
-      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();
-      xbt_os_walltimer_stop(timer);
-      xbt_os_timer_free(timer);
-      xbt_os_walltimer_stop(global_timer);
-      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-      xbt_os_timer_free(global_timer);
-
       return 1;
 #endif
     }
   }
 
-#ifdef MC_DEBUG
-  xbt_os_walltimer_start(timer);
-#endif
-
   /* Compare heap */
   if (mmalloc_compare_heap(s1, s2) > 0) {
     XBT_TRACE3(mc, state_diff, num1, num2, "Different heap");
 
 #ifdef MC_DEBUG
-    xbt_os_walltimer_stop(timer);
-    mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer);
     XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
     errors++;
 #else
@@ -656,37 +554,12 @@ int snapshot_compare(void *state1, void *state2)
     XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
 #endif
 
-    reset_heap_information();
-    xbt_os_walltimer_stop(timer);
-    xbt_os_timer_free(timer);
-    xbt_os_walltimer_stop(global_timer);
-    mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-    xbt_os_timer_free(global_timer);
-
     return 1;
-#endif
-  } else {
-#ifdef MC_DEBUG
-    xbt_os_walltimer_stop(timer);
 #endif
   }
 
   reset_heap_information();
 
-  xbt_os_walltimer_stop(timer);
-  xbt_os_timer_free(timer);
-
-#ifdef MC_VERBOSE
-  xbt_os_walltimer_stop(global_timer);
-  mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-#endif
-
-  xbt_os_timer_free(global_timer);
-
-#ifdef MC_DEBUG
-  print_comparison_times();
-#endif
-
 #ifdef MC_VERBOSE
   if (errors || hash_result)
     XBT_VERB("(%d - %d) Difference found", num1, num2);
@@ -709,18 +582,4 @@ int snapshot_compare(void *state1, void *state2)
 
 }
 
-/***************************** Statistics *****************************/
-/*******************************************************************/
-
-void print_comparison_times()
-{
-  XBT_DEBUG("*** Comparison times ***");
-  XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time);
-  XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time);
-  XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time);
-  XBT_DEBUG("- GLobal variables : %f", mc_comp_times->global_variables_comparison_time);
-  XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time);
-  XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time);
-}
-
 }