X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4aaa273789861a01e8e9b356d9005b629b3baa47..4b6ea22affbf2fb45a2e80779c789047121ceff6:/src/mc/mc_checkpoint.cpp

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index d69b3a8958..13c9397b9a 100644
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -34,6 +34,7 @@
 #include "mc_unw.h"
 #include "mc_protocol.h"
 #include "mc_smx.h"
+#include "mc_hash.hpp"
 
 using simgrid::mc::remote;
 
@@ -45,23 +46,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
 /************************************  Free functions **************************************/
 /*****************************************************************************************/
 
-s_mc_snapshot_stack::~s_mc_snapshot_stack()
-{
-  xbt_dynar_free(&(this->stack_frames));
-  mc_unw_destroy_context(this->context);
-  xbt_free(this->context);
-}
-
-static void MC_snapshot_stack_free(mc_snapshot_stack_t s)
-{
-  if (s)
-    delete(s);
-}
-
 static void MC_snapshot_stack_free_voidp(void *s)
 {
   mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s;
-  MC_snapshot_stack_free(stack);
+  delete stack;
 }
 
 static void local_variable_free_voidp(void *v)
@@ -152,7 +140,7 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
   else if (type == simgrid::mc::RegionType::Heap)
     xbt_assert(!object_info, "Unexpected object info for heap region.");
 
-  const bool privatization_aware = MC_object_info_is_privatized(object_info);
+  const bool privatization_aware = object_info && object_info->privatized();
 
   simgrid::mc::RegionSnapshot region;
   if (privatization_aware && MC_smpi_process_count())
@@ -169,13 +157,15 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
 
 static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot)
 {
-  const size_t n = process->object_infos_size;
+  const size_t n = process->object_infos.size();
   snapshot->snapshot_regions.resize(n + 1);
-  for (size_t i = 0; i != n; ++i) {
-    mc_object_info_t object_info = process->object_infos[i];
-    MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data, object_info,
+  int i = 0;
+  for (auto const& object_info : process->object_infos) {
+    MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data,
+      object_info.get(),
       object_info->start_rw, object_info->start_rw,
       object_info->end_rw - object_info->start_rw);
+    ++i;
   }
 
   xbt_mheap_t heap = process->get_heap();
@@ -270,7 +260,7 @@ void MC_find_object_address(std::vector<simgrid::mc::VmMap> const& maps, mc_obje
  *  \param ip    Instruction pointer
  *  \return      true if the variable is valid
  * */
-static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
+static bool mc_valid_variable(mc_variable_t var, mc_frame_t scope,
                               const void *ip)
 {
   // The variable is not yet valid:
@@ -281,7 +271,7 @@ static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
 }
 
 static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
-                                           dw_frame_t scope, int process_index,
+                                           mc_frame_t scope, int process_index,
                                            std::vector<s_local_variable>& result)
 {
   mc_process_t process = &mc_model_checker->process();
@@ -291,7 +281,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
     return;
 
   unsigned cursor = 0;
-  dw_variable_t current_variable;
+  mc_variable_t current_variable;
   xbt_dynar_foreach(scope->variables, cursor, current_variable) {
 
     if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip))
@@ -314,10 +304,10 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
 
     if (current_variable->address != NULL) {
       new_var.address = current_variable->address;
-    } else if (current_variable->locations.size != 0) {
+    } else if (!current_variable->location_list.empty()) {
       s_mc_location_t location;
       mc_dwarf_resolve_locations(
-        &location, &current_variable->locations,
+        &location, &current_variable->location_list,
         current_variable->object_info,
         &(stack_frame->unw_cursor),
         (void *) stack_frame->frame_base,
@@ -340,39 +330,31 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
   }
 
   // Recursive processing of nested scopes:
-  dw_frame_t nested_scope = NULL;
+  mc_frame_t nested_scope = nullptr;
   xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
     mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result);
   }
 }
 
-static std::vector<s_local_variable> MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index)
+static std::vector<s_local_variable> MC_get_local_variables_values(
+  std::vector<s_mc_stack_frame_t>& stack_frames, int process_index)
 {
-
-  unsigned cursor1 = 0;
-  mc_stack_frame_t stack_frame;
-
   std::vector<s_local_variable> variables;
-  xbt_dynar_foreach(stack_frames, cursor1, stack_frame) {
-    mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables);
-  }
+  for (s_mc_stack_frame_t& stack_frame : stack_frames)
+    mc_fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);
   return std::move(variables);
 }
 
 static void MC_stack_frame_free_voipd(void *s)
 {
   mc_stack_frame_t stack_frame = *(mc_stack_frame_t *) s;
-  if (stack_frame) {
-    xbt_free(stack_frame->frame_name);
-    xbt_free(stack_frame);
-  }
+  delete(stack_frame);
 }
 
-static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context)
+static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t stack_context)
 {
   mc_process_t process = &mc_model_checker->process();
-  xbt_dynar_t result =
-      xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd);
+  std::vector<s_mc_stack_frame_t> result;
 
   unw_cursor_t c;
 
@@ -384,36 +366,37 @@ static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context)
   } else
     while (1) {
 
-      mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
-      xbt_dynar_push(result, &stack_frame);
+      s_mc_stack_frame_t stack_frame;
 
-      stack_frame->unw_cursor = c;
+      stack_frame.unw_cursor = c;
 
       unw_word_t ip, sp;
 
       unw_get_reg(&c, UNW_REG_IP, &ip);
       unw_get_reg(&c, UNW_REG_SP, &sp);
 
-      stack_frame->ip = ip;
-      stack_frame->sp = sp;
+      stack_frame.ip = ip;
+      stack_frame.sp = sp;
 
       // TODO, use real addresses in frame_t instead of fixing it here
 
-      dw_frame_t frame = process->find_function(remote(ip));
-      stack_frame->frame = frame;
+      mc_frame_t frame = process->find_function(remote(ip));
+      stack_frame.frame = frame;
 
       if (frame) {
-        stack_frame->frame_name = xbt_strdup(frame->name);
-        stack_frame->frame_base =
+        stack_frame.frame_name = frame->name;
+        stack_frame.frame_base =
             (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c);
       } else {
-        stack_frame->frame_base = 0;
-        stack_frame->frame_name = NULL;
+        stack_frame.frame_base = 0;
+        stack_frame.frame_name = std::string();
       }
 
+      result.push_back(std::move(stack_frame));
+
       /* Stop before context switch with maestro */
-      if (frame != NULL && frame->name != NULL
-          && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
+      if (frame != nullptr &&
+          frame->name == "smx_ctx_sysv_wrapper")
         break;
 
       int ret = unw_step(&c);
@@ -424,52 +407,48 @@ static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context)
       }
     }
 
-  if (xbt_dynar_length(result) == 0) {
+  if (result.empty()) {
     XBT_INFO("unw_init_local failed");
     xbt_abort();
   }
 
-  return result;
+  return std::move(result);
 };
 
-static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
+static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
 {
-
-  xbt_dynar_t res =
-      xbt_dynar_new(sizeof(s_mc_snapshot_stack_t),
-                    MC_snapshot_stack_free_voidp);
+  std::vector<s_mc_snapshot_stack_t> res;
 
   unsigned int cursor = 0;
   stack_region_t current_stack;
 
   // FIXME, cross-process support (stack_areas)
   xbt_dynar_foreach(stacks_areas, cursor, current_stack) {
-    mc_snapshot_stack_t st = new s_mc_snapshot_stack();
+    s_mc_snapshot_stack_t st;
 
     // Read the context from remote process:
     unw_context_t context;
     mc_model_checker->process().read_bytes(
       &context, sizeof(context), remote(current_stack->context));
 
-    st->context = xbt_new0(s_mc_unw_context_t, 1);
-    if (mc_unw_init_context(st->context, &mc_model_checker->process(),
+    if (mc_unw_init_context(&st.context, &mc_model_checker->process(),
       &context) < 0) {
       xbt_die("Could not initialise the libunwind context.");
     }
+    st.stack_frames = MC_unwind_stack_frames(&st.context);
+    st.local_variables = MC_get_local_variables_values(st.stack_frames, current_stack->process_index);
+    st.process_index = current_stack->process_index;
 
-    st->stack_frames = MC_unwind_stack_frames(st->context);
-    st->local_variables = MC_get_local_variables_values(st->stack_frames, current_stack->process_index);
-    st->process_index = current_stack->process_index;
+    unw_word_t sp = st.stack_frames[0].sp;
 
-    unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
+    res.push_back(std::move(st));
 
-    xbt_dynar_push(res, &st);
     size_t stack_size =
       (char*) current_stack->address + current_stack->size - (char*) sp;
     (*snapshot)->stack_sizes.push_back(stack_size);
   }
 
-  return res;
+  return std::move(res);
 
 }
 
@@ -631,8 +610,8 @@ mc_snapshot_t MC_take_snapshot(int num_state)
   if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
     snapshot->stacks =
         MC_take_snapshot_stacks(&snapshot);
-    if (_sg_mc_hash && snapshot->stacks != NULL) {
-      snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks);
+    if (_sg_mc_hash && !snapshot->stacks.empty()) {
+      snapshot->hash = simgrid::mc::hash(*snapshot);
     } else {
       snapshot->hash = 0;
     }