X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/339868721e559321451cb88acb1dac2722070b4c..3f5a22ee597719eb48bef0979b0628f7b76bfbe9:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index ebc9475ce5..74c26ea9fd 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -46,14 +46,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, /************************************ Free functions **************************************/ /*****************************************************************************************/ -s_mc_snapshot_stack::~s_mc_snapshot_stack() -{ - xbt_dynar_free(&(this->stack_frames)); - 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; @@ -148,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()) @@ -165,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(); @@ -202,9 +196,11 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) * * `dl_iterate_phdr` would be more robust but would not work in cross-process. * */ -void MC_find_object_address(std::vector const& maps, mc_object_info_t result) +void MC_find_object_address( + std::vector const& maps, mc_object_info_t result) { - const char *name = basename(result->file_name); + const char* file_name = xbt_strdup(result->file_name.c_str()); + const char *name = basename(file_name); for (size_t i = 0; i < maps.size(); ++i) { simgrid::mc::VmMap const& reg = maps[i]; if (maps[i].pathname.empty() @@ -249,7 +245,6 @@ void MC_find_object_address(std::vector const& maps, mc_obje if (result->end_exec && (const void*) result->end_exec > result->end) result->end = result->end_exec; - xbt_assert(result->file_name); xbt_assert(result->start_rw); xbt_assert(result->start_exec); } @@ -266,7 +261,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: @@ -277,7 +272,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,11 +281,10 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, if (ip < scope->low_pc || ip >= scope->high_pc) return; - unsigned cursor = 0; - dw_variable_t current_variable; - xbt_dynar_foreach(scope->variables, cursor, current_variable) { + for(simgrid::mc::Variable& current_variable : + scope->variables) { - if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip)) + if (!mc_valid_variable(¤t_variable, scope, (void *) stack_frame->ip)) continue; int region_type; @@ -303,18 +297,18 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, s_local_variable_t new_var; new_var.subprogram = stack_frame->frame; new_var.ip = stack_frame->ip; - new_var.name = current_variable->name; - new_var.type = current_variable->type; + new_var.name = current_variable.name; + new_var.type = current_variable.type; new_var.region = region_type; new_var.address = nullptr; - if (current_variable->address != NULL) { - new_var.address = current_variable->address; - } else if (current_variable->locations.size != 0) { + if (current_variable.address != NULL) { + new_var.address = current_variable.address; + } else if (!current_variable.location_list.empty()) { s_mc_location_t location; mc_dwarf_resolve_locations( - &location, ¤t_variable->locations, - current_variable->object_info, + &location, ¤t_variable.location_list, + current_variable.object_info, &(stack_frame->unw_cursor), (void *) stack_frame->frame_base, &mc_model_checker->process(), process_index); @@ -336,22 +330,17 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, } // Recursive processing of nested scopes: - dw_frame_t nested_scope = NULL; - xbt_dynar_foreach(scope->scopes, cursor, nested_scope) { - mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result); - } + for(simgrid::mc::Frame& nested_scope : scope->scopes) + mc_fill_local_variables_values( + stack_frame, &nested_scope, process_index, result); } -static std::vector MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index) +static std::vector MC_get_local_variables_values( + std::vector& stack_frames, int process_index) { - - unsigned cursor1 = 0; - mc_stack_frame_t stack_frame; - std::vector 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); } @@ -361,11 +350,10 @@ static void MC_stack_frame_free_voipd(void *s) delete(stack_frame); } -static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) +static std::vector 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 result; unw_cursor_t c; @@ -377,36 +365,37 @@ static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) } else while (1) { - mc_stack_frame_t stack_frame = new s_mc_stack_frame_t(); - 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 = 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 = std::string(); + 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); @@ -417,12 +406,12 @@ 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 std::vector MC_take_snapshot_stacks(mc_snapshot_t * snapshot) @@ -441,16 +430,15 @@ 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; - unw_word_t sp = xbt_dynar_get_as(st.stack_frames, 0, mc_stack_frame_t)->sp; + unw_word_t sp = st.stack_frames[0].sp; res.push_back(std::move(st)); @@ -622,7 +610,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; }