X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc1eb8c4e293f75ccddc257ebc44bfcd0883073e..04dab60fb0a697e6e4e88956753ecd96b9d28bca:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index cda2505020..8821fbb1ca 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -34,6 +34,11 @@ #include "mc_unw.h" #include "mc_protocol.h" #include "mc_smx.h" +#include "mc_hash.hpp" + +#include "mc/ObjectInformation.hpp" +#include "mc/Frame.hpp" +#include "mc/Variable.hpp" using simgrid::mc::remote; @@ -45,38 +50,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, /************************************ Free functions **************************************/ /*****************************************************************************************/ -static void MC_snapshot_stack_free(mc_snapshot_stack_t s) -{ - if (s) { - xbt_dynar_free(&(s->local_variables)); - xbt_dynar_free(&(s->stack_frames)); - mc_unw_destroy_context(s->context); - xbt_free(s->context); - xbt_free(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); -} - -static void local_variable_free(local_variable_t v) -{ - xbt_free(v->name); - xbt_free(v); -} - -static void local_variable_free_voidp(void *v) -{ - local_variable_free((local_variable_t) * (void **) v); -} - -} - -extern "C" { - /** @brief Restore a region from a snapshot * * @param reg Target region @@ -110,6 +83,7 @@ static void MC_region_restore(mc_mem_region_t region) namespace simgrid { namespace mc { +#ifdef HAVE_SMPI simgrid::mc::RegionSnapshot privatized_region( RegionType region_type, void *start_addr, void* permanent_addr, size_t size ) @@ -139,6 +113,7 @@ simgrid::mc::RegionSnapshot privatized_region( region.privatized_data(std::move(data)); return std::move(region); } +#endif } } @@ -147,7 +122,7 @@ extern "C" { static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, simgrid::mc::RegionType type, - mc_object_info_t object_info, + simgrid::mc::ObjectInformation* object_info, void *start_addr, void* permanent_addr, size_t size) { if (type == simgrid::mc::RegionType::Data) @@ -155,12 +130,14 @@ 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); - simgrid::mc::RegionSnapshot region; + +#ifdef HAVE_SMPI + const bool privatization_aware = object_info && object_info->privatized(); if (privatization_aware && MC_smpi_process_count()) region = simgrid::mc::privatized_region(type, start_addr, permanent_addr, size); else +#endif region = simgrid::mc::region(type, start_addr, permanent_addr, size); region.object_info(object_info); @@ -170,15 +147,17 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, return; } -static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) +static void MC_get_memory_regions(simgrid::mc::Process* 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(); @@ -209,9 +188,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, simgrid::mc::ObjectInformation* 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() @@ -256,7 +237,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); } @@ -273,7 +253,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(simgrid::mc::Variable* var, simgrid::mc::Frame* scope, const void *ip) { // The variable is not yet valid: @@ -284,19 +264,19 @@ 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, xbt_dynar_t result) + simgrid::mc::Frame* scope, int process_index, + std::vector& result) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); void *ip = (void *) stack_frame->ip; 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; @@ -306,27 +286,28 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, else region_type = 2; - local_variable_t new_var = xbt_new0(s_local_variable_t, 1); - new_var->subprogram = stack_frame->frame; - new_var->ip = stack_frame->ip; - new_var->name = xbt_strdup(current_variable->name); - new_var->type = current_variable->type; - new_var->region = region_type; - - if (current_variable->address != NULL) { - new_var->address = current_variable->address; - } else if (current_variable->locations.size != 0) { + 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.region = region_type; + new_var.address = nullptr; + + 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); switch(mc_get_location_type(&location)) { case MC_LOCATION_TYPE_ADDRESS: - new_var->address = location.memory_location; + new_var.address = location.memory_location; break; case MC_LOCATION_TYPE_REGISTER: default: @@ -337,45 +318,34 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, xbt_die("No address"); } - xbt_dynar_push(result, &new_var); + result.push_back(std::move(new_var)); } // 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 xbt_dynar_t 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; - xbt_dynar_t variables = - xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); - - xbt_dynar_foreach(stack_frames, cursor1, stack_frame) { - mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables); - } - - return variables; + std::vector 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 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); + simgrid::mc::Process* process = &mc_model_checker->process(); + std::vector result; unw_cursor_t c; @@ -387,36 +357,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; + simgrid::mc::Frame* 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); @@ -427,52 +398,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 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 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 = xbt_new(s_mc_snapshot_stack_t, 1); + 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); } @@ -572,8 +539,10 @@ static std::vector MC_get_current_fds(pid_t pid) } link[res] = '\0'; +#ifdef HAVE_SMPI if(smpi_is_privatisation_file(link)) continue; +#endif // This is (probably) the DIR* we are reading: // TODO, read all the file entries at once and close the DIR.* @@ -610,7 +579,7 @@ mc_snapshot_t MC_take_snapshot(int num_state) { XBT_DEBUG("Taking snapshot %i", num_state); - mc_process_t mc_process = &mc_model_checker->process(); + simgrid::mc::Process* mc_process = &mc_model_checker->process(); mc_snapshot_t snapshot = new simgrid::mc::Snapshot(); @@ -634,8 +603,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; }