X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb3ad7bf1f83d355e938a83cf02f78bc898eefbb..7ef55d47978f2f2ef20bd27c85881faa99147034:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index abd70f6fe8..9a923b26c5 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -13,6 +13,8 @@ #include "xbt/module.h" #include +#include "xbt/mmalloc/mmprivate.h" + #include "../simix/smx_private.h" #include @@ -25,8 +27,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, char *libsimgrid_path; -static void MC_find_object_address(memory_map_t maps, mc_object_info_t result); - /************************************ Free functions **************************************/ /*****************************************************************************************/ @@ -45,7 +45,6 @@ static void MC_snapshot_stack_free_voidp(void *s){ static void local_variable_free(local_variable_t v){ xbt_free(v->frame); xbt_free(v->name); - xbt_free(v->type); xbt_free(v); } @@ -105,108 +104,13 @@ static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start static void MC_get_memory_regions(mc_snapshot_t snapshot){ - FILE *fp; - char *line = NULL; - ssize_t read; - size_t n = 0; - - char *lfields[6] = {0}, *tok; - void *start_addr, *start_addr1, *end_addr; - size_t size; - int i; - - fp = fopen("/proc/self/maps", "r"); - - xbt_assert(fp, - "Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug."); - - setbuf(fp, NULL); - - while((read = xbt_getline(&line, &n, fp)) != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - /* Tokenize the line using spaces as delimiters and store each token */ - lfields[0] = strtok(line, " "); - - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } - - /* First get the permissions flags, need write permission */ - if(lfields[1][1] == 'w'){ - - /* Get the start address of the map */ - tok = strtok(lfields[0], "-"); - start_addr = (void *)strtoul(tok, NULL, 16); - - if(start_addr == std_heap){ /* Std_heap ? */ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - MC_snapshot_add_region(snapshot, 0, start_addr, (char*)end_addr - (char*)start_addr); - snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - }else{ /* map name == libsimgrid || binary_name ? */ - if(lfields[5] != NULL){ - if(!memcmp(basename(lfields[5]), "libsimgrid", 10)){ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - size = (char*)end_addr - (char*)start_addr; - /* BSS and data segments may be separated according to the OS */ - if((read = xbt_getline(&line, &n, fp)) != -1){ - line[read - 1] = '\0'; - lfields[0] = strtok(line, " "); - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } - if(lfields[1][1] == 'w' && lfields[5] == NULL){ - tok = strtok(lfields[0], "-"); - start_addr1 = (void *)strtoul(tok, NULL, 16); - tok = strtok(NULL, "-"); - size += (char *)(void *)strtoul(tok, NULL, 16) - (char*)start_addr1; - } - } - MC_snapshot_add_region(snapshot, 1, start_addr, size); - }else if(!memcmp(basename(lfields[5]), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - size = (char*)end_addr - (char*)start_addr; - /* BSS and data segments may be separated according to the OS */ - if((read = xbt_getline(&line, &n, fp)) != -1){ - line[read - 1] = '\0'; - lfields[0] = strtok(line, " "); - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } - tok = strtok(lfields[0], "-"); - start_addr1 = (void *)strtoul(tok, NULL, 16); - if(lfields[1][1] == 'w'){ - if(start_addr1 == std_heap){ /* Std_heap ? */ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - MC_snapshot_add_region(snapshot, 0, start_addr1, (char*)end_addr - (char*)start_addr1); - snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - }else if(start_addr1 != raw_heap){ - tok = strtok(NULL, "-"); - size += (char *)(void *)strtoul(tok, NULL, 16) - (char *)start_addr1; - } - } - } - MC_snapshot_add_region(snapshot, 2, start_addr, size); - }else if (!memcmp(lfields[5], "[stack]", 7)){ - maestro_stack_start = start_addr; - tok = strtok(NULL, "-"); - maestro_stack_end = (void *)strtoul(tok, NULL, 16); - } - } - } - } - - } - - free(line); - fclose(fp); + void* start_heap = ((xbt_mheap_t)std_heap)->base; + void* end_heap = ((xbt_mheap_t)std_heap)->breakval; + MC_snapshot_add_region(snapshot, 0, start_heap, (char*) end_heap - (char*) start_heap); + snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + MC_snapshot_add_region(snapshot, 1, mc_libsimgrid_info->start_rw, mc_libsimgrid_info->end_rw - mc_libsimgrid_info->start_rw); + MC_snapshot_add_region(snapshot, 2, mc_binary_info->start_rw, mc_binary_info->end_rw - mc_binary_info->start_rw); } /** @brief Finds the range of the different memory segments and binary paths */ @@ -267,7 +171,7 @@ static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type) { // TODO, support "switch type" (looking up the type in another lib) when possible } -static void MC_post_process_types(mc_object_info_t info) { +void MC_post_process_types(mc_object_info_t info) { xbt_dict_cursor_t cursor = NULL; char *origin; dw_type_t type; @@ -284,18 +188,8 @@ static void MC_post_process_types(mc_object_info_t info) { } } -/** \brief Finds informations about a given shared object/executable */ -mc_object_info_t MC_find_object_info(memory_map_t maps, char* name) { - mc_object_info_t result = MC_new_object_info(); - result->file_name = xbt_strdup(name); - MC_find_object_address(maps, result); - MC_dwarf_get_variables(result); - MC_post_process_types(result); - return result; -} - /** \brief Fills the position of the .bss and .data sections. */ -static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { +void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { unsigned int i = 0; s_map_region_t reg; @@ -311,6 +205,12 @@ static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { maps->regions[i].pathname); 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; + } } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){ xbt_assert(!result->start_exec, "Multiple executable segments for %s, not supported", @@ -358,7 +258,7 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){ new_var->frame = xbt_strdup(stack_frame->frame_name); new_var->ip = stack_frame->ip; new_var->name = xbt_strdup(current_variable->name); - new_var->type = strdup(current_variable->type_origin); + new_var->type = current_variable->type; new_var->region= region_type; /* if(current_variable->address!=NULL) { @@ -391,7 +291,8 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) { unw_cursor_t c; - char frame_name[256]; + 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)){ @@ -400,29 +301,28 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) { stack_frame->unw_cursor = c; - unw_get_reg(&c, UNW_REG_IP, &stack_frame->ip); - unw_get_reg(&c, UNW_REG_SP, &stack_frame->sp); + 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; - unw_word_t off; - unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off); - stack_frame->frame_name = xbt_strdup(frame_name); + // TODO, use real addresses in frame_t instead of fixing it here - dw_frame_t frame; - if((long)stack_frame->ip > (long) mc_libsimgrid_info->start_exec) - frame = xbt_dict_get_or_null(mc_libsimgrid_info->local_variables, frame_name); - else - frame = xbt_dict_get_or_null(mc_binary_info->local_variables, frame_name); + dw_frame_t frame = MC_find_function_by_ip((void*) ip); stack_frame->frame = frame; - if(frame != NULL){ - unw_word_t normalized_ip = (unw_word_t)frame->low_pc + (unw_word_t)off; - stack_frame->frame_base = (unw_word_t)mc_find_frame_base(normalized_ip, frame, &c); + 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); } else { stack_frame->frame_base = 0; } /* Stop before context switch with maestro */ - if(!strcmp(frame_name, "smx_ctx_sysv_wrapper")) + if(frame!=NULL && frame->name!=NULL && !strcmp(frame->name, "smx_ctx_sysv_wrapper")) break; }