X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f86d3285f605e43ba3f845eb2f5ee2502b2aed4..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/mc/mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index abeb22dc37..1019fdb8bb 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,109 +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 ****************************/
-/********************************************************************/
+}
+
+namespace simgrid {
+namespace mc {
 
-static void stack_region_free(stack_region_t s)
-{
-  if (s) {
-    xbt_free(s);
+/** 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,
-                                   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:
@@ -185,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++;
@@ -231,18 +208,18 @@ static int compare_areas_with_type(struct mc_compare_state& state,
   }
   case DW_TAG_structure_type:
   case DW_TAG_class_type:
-    for(simgrid::mc::Type& member : type->members) {
-      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;
     }
@@ -258,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,
@@ -292,7 +269,7 @@ 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;
+  ComparisonState state;
 
   std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
 
@@ -305,7 +282,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,
@@ -331,7 +308,7 @@ 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 (stack1->local_variables.size() != stack2->local_variables.size()) {
     XBT_VERB("Different number of local variables");
@@ -359,7 +336,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 +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;
@@ -584,7 +561,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 +581,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();