X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..47fd440ad6382d295645c81ca4c5c09bd5d51cc6:/src/mc/mc_hash.cpp

diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp
index 4164c537ad..7709cc7ac0 100644
--- a/src/mc/mc_hash.cpp
+++ b/src/mc/mc_hash.cpp
@@ -12,8 +12,7 @@
 #include "mc_private.h"
 #include "mc/datatypes.h"
 #include <mc/mc.h>
-
-extern "C" {
+#include "mc_hash.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
 
@@ -284,22 +283,22 @@ static void mc_hash_stack(mc_hash_t * hash, mc_snapshot_stack_t stack,
   unsigned cursor = 0;
   mc_stack_frame_t stack_frame;
 
-  xbt_dynar_foreach(stack->stack_frames, cursor, stack_frame) {
+  for(s_mc_stack_frame_t const& stack_frame : stack->stack_frames) {
 
-    MC_HASH(*hash, stack_frame->ip);
+    MC_HASH(*hash, stack_frame.ip);
 
     mc_object_info_t info;
-    if (stack_frame->ip >= (unw_word_t) libsimgrid_info->start_exec
-        && stack_frame->ip < (unw_word_t) libsimgrid_info->end_exec)
+    if (stack_frame.ip >= (unw_word_t) libsimgrid_info->start_exec
+        && stack_frame.ip < (unw_word_t) libsimgrid_info->end_exec)
       info = libsimgrid_info;
-    else if (stack_frame->ip >= (unw_word_t) binary_info->start_exec
-             && stack_frame->ip < (unw_word_t) binary_info->end_exec)
+    else if (stack_frame.ip >= (unw_word_t) binary_info->start_exec
+             && stack_frame.ip < (unw_word_t) binary_info->end_exec)
       info = binary_info;
     else
       continue;
 
-    mc_hash_stack_frame(hash, info, &(stack_frame->unw_cursor),
-                        stack_frame->frame, (void *) stack_frame->frame_base,
+    mc_hash_stack_frame(hash, info, &(stack_frame.unw_cursor),
+                        stack_frame.frame, (void *) stack_frame.frame_base,
                         state);
 
   }
@@ -322,7 +321,7 @@ static void mc_hash_stacks(mc_hash_t * hash, mc_hashing_state * state,
 }
 #endif
 
-uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks)
+uint64_t mc_hash_processes_state(int num_state, std::vector<s_mc_snapshot_stack_t> const& stacks)
 {
   XBT_DEBUG("START hash %i", num_state);
 
@@ -344,5 +343,3 @@ uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks)
   XBT_DEBUG("END hash %i", num_state);
   return hash;
 }
-
-}