X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/47fd440ad6382d295645c81ca4c5c09bd5d51cc6..4b6ea22affbf2fb45a2e80779c789047121ceff6:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 3fd0584568..13c9397b9a 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -46,13 +46,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, /************************************ Free functions **************************************/ /*****************************************************************************************/ -s_mc_snapshot_stack::~s_mc_snapshot_stack() -{ - if (this->context) - mc_unw_destroy_context(this->context); - xbt_free(this->context); -} - static void MC_snapshot_stack_free_voidp(void *s) { mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s; @@ -147,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()) @@ -164,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(); @@ -265,7 +260,7 @@ void MC_find_object_address(std::vector 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: @@ -276,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& result) { mc_process_t process = &mc_model_checker->process(); @@ -286,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)) @@ -309,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, ¤t_variable->locations, + &location, ¤t_variable->location_list, current_variable->object_info, &(stack_frame->unw_cursor), (void *) stack_frame->frame_base, @@ -335,7 +330,7 @@ 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); } @@ -385,7 +380,7 @@ static std::vector MC_unwind_stack_frames(mc_unw_context_t s // TODO, use real addresses in frame_t instead of fixing it here - dw_frame_t frame = process->find_function(remote(ip)); + mc_frame_t frame = process->find_function(remote(ip)); stack_frame.frame = frame; if (frame) { @@ -400,8 +395,8 @@ static std::vector MC_unwind_stack_frames(mc_unw_context_t s 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); @@ -436,12 +431,11 @@ static std::vector MC_take_snapshot_stacks(mc_snapshot_t 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.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; @@ -617,7 +611,7 @@ mc_snapshot_t MC_take_snapshot(int num_state) snapshot->stacks = MC_take_snapshot_stacks(&snapshot); if (_sg_mc_hash && !snapshot->stacks.empty()) { - snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks); + snapshot->hash = simgrid::mc::hash(*snapshot); } else { snapshot->hash = 0; }