X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..b53d4ab74ae9c8c50b84f8efd9c96a82653ee8d9:/src/mc/mc_checkpoint.c?ds=sidebyside diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index d534d891d7..db664a6872 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -147,7 +147,7 @@ void MC_init_memory_map_info(){ } -/** \brief Fill/llokup the "subtype" field. +/** \brief Fill/lookup the "subtype" field. */ static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type) { @@ -163,12 +163,11 @@ static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type) { // Try to find a more complete description of the type: // We need to fix in order to support C++. - dw_type_t subtype = xbt_dict_get_or_null(info->types_by_name, type->subtype->name); + dw_type_t subtype = xbt_dict_get_or_null(info->full_types_by_name, type->subtype->name); if(subtype!=NULL) { type->subtype = subtype; } - // TODO, support "switch type" (looking up the type in another lib) when possible } void MC_post_process_types(mc_object_info_t info) { @@ -188,7 +187,10 @@ void MC_post_process_types(mc_object_info_t info) { } } -/** \brief Fills the position of the .bss and .data sections. */ +/** \brief Fills the position of the segments (executable, read-only, read/write). + * + * TODO, use dl_iterate_phdr to be more robust + * */ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { unsigned int i = 0; @@ -206,7 +208,6 @@ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { result->start_rw = reg.start_addr; result->end_rw = reg.end_addr; // .bss is usually after the .data: - // TODO, use dl_iterate_phdr to be more robust s_map_region_t* next = &(maps->regions[i+1]); if(next->pathname == NULL && (next->prot & PROT_WRITE) && next->start_addr == reg.end_addr) { result->end_rw = maps->regions[i+1].end_addr; @@ -236,6 +237,23 @@ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { /************************************* Take Snapshot ************************************/ /****************************************************************************************/ +/** \brief Checks whether the variable is in scope for a given IP. + * + * A variable may be defined only from a given value of IP. + * + * \param var Variable description + * \param frame Scope description + * \param ip Instruction pointer + * \return true if the variable is valid + * */ +static bool mc_valid_variable(dw_variable_t var, dw_frame_t frame, const void* ip) { + // The variable is not yet valid: + if((const void*)((const char*) frame->low_pc + var->start_scope) > ip) + return false; + else + return true; +} + static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){ unsigned cursor1 = 0; @@ -248,6 +266,9 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){ dw_variable_t current_variable; xbt_dynar_foreach(stack_frame->frame->variables, cursor2, current_variable){ + if(!mc_valid_variable(current_variable, stack_frame->frame, (void*) stack_frame->ip)) + continue; + int region_type; if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec) region_type = 1; @@ -264,9 +285,9 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){ /* if(current_variable->address!=NULL) { new_var->address = current_variable->address; } else */ - if(current_variable->location != NULL){ - new_var->address = (void*) MC_dwarf_resolve_location( - &(stack_frame->unw_cursor), current_variable->location, (void*)stack_frame->frame_base); + if(current_variable->locations.size != 0){ + new_var->address = (void*) mc_dwarf_resolve_locations(¤t_variable->locations, + &(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL); } xbt_dynar_push(variables, &new_var); @@ -291,9 +312,6 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) { unw_cursor_t c; - dw_frame_t test = MC_find_function_by_ip(&MC_unwind_stack_frames); - xbt_assert(test); - int ret; for(ret = unw_init_local(&c, (unw_context_t *)stack_context); ret >= 0; ret = unw_step(&c)){ mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1); @@ -316,7 +334,7 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) { if(frame) { stack_frame->frame_name = xbt_strdup(frame->name); - stack_frame->frame_base = (unw_word_t)mc_find_frame_base((void*)ip, frame, &c); + stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame, &c); } else { stack_frame->frame_base = 0; } @@ -442,6 +460,47 @@ void MC_restore_snapshot(mc_snapshot_t snapshot){ } +void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot) { + + // If not in a process state/clone: + if(!snapshot) { + return (uintptr_t*) addr; + } + + // If it is in a snapshot: + for(size_t i=0; i!=NB_REGIONS; ++i) { + mc_mem_region_t region = snapshot->regions[i]; + uintptr_t start = (uintptr_t) region->start_addr; + uintptr_t end = start + region->size; + + // The address is in this region: + if(addr >= start && addr < end) { + uintptr_t offset = addr - start; + return (void*) ((uintptr_t)region->data + offset); + } + + } + + // It is not in a snapshot: + return (void*) addr; +} + +uintptr_t mc_untranslate_address(void* addr, mc_snapshot_t snapshot) { + if(!snapshot) { + return (uintptr_t) addr; + } + + for(size_t i=0; i!=NB_REGIONS; ++i) { + mc_mem_region_t region = snapshot->regions[i]; + if(addr>=region->data && addr<=(void*)(((char*)region->data)+region->size)) { + size_t offset = (size_t) ((char*) addr - (char*) region->data); + return ((uintptr_t) region->start_addr) + offset; + } + } + + return (uintptr_t) addr; +} + mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ return MC_take_snapshot(1); }