X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a368df820d52591e718cfcac6f6a1a11dd59e4f..d4bb65aef6bed4db7389e777dfa7828bdebd1c02:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 1e2bcd1359..63d6104cd5 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -4,7 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#define _GNU_SOURCE +#include #include "mc_private.h" #include "xbt/module.h" @@ -12,6 +13,8 @@ #include +#include "mc_private.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); @@ -220,7 +223,7 @@ void MC_init_memory_map_info(){ else if ((reg.prot & PROT_WRITE) && !memcmp(maps->regions[i].pathname, "[stack]", 7)){ maestro_stack_start = reg.start_addr; maestro_stack_end = reg.end_addr; - }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ + } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ if(libsimgrid_path == NULL) libsimgrid_path = strdup(maps->regions[i].pathname); } @@ -241,6 +244,10 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name) { result->file_name = xbt_strdup(name); result->start_data = NULL; result->start_text = NULL; + result->start_plt = NULL; + result->end_plt = NULL; + result->start_got_plt = NULL; + result->end_got_plt = NULL; MC_find_object_address(maps, result); MC_get_plt_section(result); MC_dwarf_get_variables(result); @@ -251,18 +258,15 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name) { static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { unsigned int i = 0; s_map_region_t reg; - const char* name = result->file_name; - int len = strlen(basename(result->file_name)); + const char* name = basename(result->file_name); while (i < maps->mapsize) { reg = maps->regions[i]; - if (maps->regions[i].pathname == NULL || memcmp(basename(maps->regions[i].pathname), basename(name), len)){ + if (maps->regions[i].pathname == NULL || strcmp(basename(maps->regions[i].pathname), name)) { // Nothing to do } else if ((reg.prot & PROT_WRITE)){ result->start_data = reg.start_addr; - i++; - reg = maps->regions[i]; - }else if (reg.prot & PROT_READ) { + } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){ result->start_text = reg.start_addr; } i++; @@ -273,7 +277,6 @@ static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { xbt_assert(result->start_text); MC_get_plt_section(result); - return result; } /** \brief Fills the position of the .plt and .got.plt sections. */ @@ -439,6 +442,8 @@ static void MC_get_hash_local(char *snapshot_hash, xbt_dynar_t stacks){ } + + static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ unw_cursor_t c; @@ -498,31 +503,7 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ entry = xbt_dynar_get_as(frame->frame_base->location.loclist, cursor, dw_location_entry_t); if((true_ip >= entry->lowpc) && (true_ip < entry->highpc)){ frame_found = 1; - switch(entry->location->type){ - case e_dw_compose: - if(xbt_dynar_length(entry->location->location.compose) > 1){ - frame_pointer_address = NULL; /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(entry->location->location.compose, 0, dw_location_t); - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - frame_pointer_address = (void*)(long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - frame_pointer_address = (void*)((long)res + location_entry->location.breg_op.offset); - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } - } - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } + frame_pointer_address = (void*) MC_dwarf_resolve_location(&c, entry->location, NULL); } cursor++; } @@ -550,42 +531,7 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ new_var->region= region_type; if(current_variable->address.location != NULL){ - switch(current_variable->address.location->type){ - case e_dw_compose: - if(xbt_dynar_length(current_variable->address.location->location.compose) > 1){ - /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(current_variable->address.location->location.compose, 0, dw_location_t); - - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - value = (long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - value = (long)res + location_entry->location.breg_op.offset; - break; - case e_dw_fbregister_op: - if(frame_pointer_address != NULL) - value = (long)((char *)frame_pointer_address + location_entry->location.fbreg_op); - else - value = 0; - break; - default: - value = 0; /* FIXME : implement other cases (with optimizations enabled)*/ - break; - } - - if(value) - new_var->address = (void *)value; - else - new_var->address = NULL; - } - break; - default : - break; - } + new_var->address = MC_dwarf_resolve_location(&c, current_variable->address.location, frame_pointer_address); } xbt_dynar_push(variables, &new_var);