X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0acb124f78b614e93e14413b3f83c173c2c77f8..4fd2f97dd395fdec3a097054bb19ab70e7e99380:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index dc16dac539..cece2e82ad 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2013. The SimGrid Team. +/* Copyright (c) 2008-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -13,6 +13,8 @@ #include "xbt/module.h" #include +#include "xbt/mmalloc/mmprivate.h" + #include "../simix/smx_private.h" #include @@ -25,14 +27,13 @@ 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 **************************************/ /*****************************************************************************************/ 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)); xbt_free(s); } } @@ -42,9 +43,7 @@ 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); } @@ -104,108 +103,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 */ @@ -242,7 +146,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) { @@ -258,15 +162,14 @@ 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 } -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; @@ -283,18 +186,11 @@ 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) { +/** \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; s_map_region_t reg; @@ -310,6 +206,11 @@ 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: + 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", @@ -335,106 +236,132 @@ static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { /************************************* Take Snapshot ************************************/ /****************************************************************************************/ -static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ - - unw_cursor_t c; - int ret; - - char frame_name[256]; - - ret = unw_init_local(&c, (unw_context_t *)stack_context); - if(ret < 0){ - XBT_INFO("unw_init_local failed"); - xbt_abort(); - } +/** \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; +} - unw_word_t ip, off; - dw_frame_t frame; +static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, dw_frame_t scope, xbt_dynar_t result) { + void* ip = (void*) stack_frame->ip; + if(ip < scope->low_pc || ip>= scope->high_pc) + return; - unsigned int cursor = 0; + unsigned cursor = 0; dw_variable_t current_variable; - int region_type; - void *frame_pointer_address = NULL; - long true_ip; - int stop = 0; - - xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); - - while(ret >= 0 && !stop){ + xbt_dynar_foreach(scope->variables, cursor, current_variable){ - unw_get_reg(&c, UNW_REG_IP, &ip); + if(!mc_valid_variable(current_variable, stack_frame->frame, (void*) stack_frame->ip)) + continue; - unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off); + int region_type; + if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec) + region_type = 1; + 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){ + new_var->address = (void*) mc_dwarf_resolve_locations(¤t_variable->locations, + current_variable->object_info, + &(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL); + } - if(!strcmp(frame_name, "smx_ctx_sysv_wrapper")) /* Stop before context switch with maestro */ - stop = 1; + xbt_dynar_push(result, &new_var); + } - if((long)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); + // 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, result); + } +} - if(frame == NULL){ - ret = unw_step(&c); - continue; - } - - true_ip = (long)frame->low_pc + (long)off; - frame_pointer_address = mc_find_frame_base(true_ip, frame, &c); - - cursor = 0; - - xbt_dynar_foreach(frame->variables, cursor, current_variable){ - - if((long)ip > (long)mc_libsimgrid_info->start_exec) - region_type = 1; - else - region_type = 2; - - local_variable_t new_var = xbt_new0(s_local_variable_t, 1); - new_var->frame = xbt_strdup(frame_name); - new_var->ip = (unsigned long)ip; - new_var->name = xbt_strdup(current_variable->name); - new_var->type = strdup(current_variable->type_origin); - new_var->region= region_type; - - /* 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(&c, current_variable->location, frame_pointer_address); - } - - xbt_dynar_push(variables, &new_var); +static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){ - } + unsigned cursor1 = 0; + mc_stack_frame_t stack_frame; + xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); - ret = unw_step(&c); - + xbt_dynar_foreach(stack_frames,cursor1,stack_frame) { + mc_fill_local_variables_values(stack_frame, stack_frame->frame, variables); } return 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); + } +} -static void *MC_get_stack_pointer(void *stack_context, void *heap){ +static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) { + xbt_dynar_t result = xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd); unw_cursor_t c; + int ret; - unw_word_t sp; + 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); + xbt_dynar_push(result, &stack_frame); + + 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; + + // TODO, use real addresses in frame_t instead of fixing it here - ret = unw_init_local(&c, (unw_context_t *)stack_context); - if(ret < 0){ + dw_frame_t frame = MC_find_function_by_ip((void*) ip); + stack_frame->frame = frame; + + if(frame) { + stack_frame->frame_name = xbt_strdup(frame->name); + stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame, frame->object_info, &c); + } else { + stack_frame->frame_base = 0; + } + + /* Stop before context switch with maestro */ + if(frame!=NULL && frame->name!=NULL && !strcmp(frame->name, "smx_ctx_sysv_wrapper")) + break; + } + + if(xbt_dynar_length(result) == 0){ XBT_INFO("unw_init_local failed"); xbt_abort(); } - unw_get_reg(&c, UNW_REG_SP, &sp); - - return ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap))); - -} + return result; +}; static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t *snapshot, void *heap){ @@ -445,8 +372,12 @@ static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t *snapshot, void *heap){ xbt_dynar_foreach(stacks_areas, cursor, current_stack){ mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); - st->local_variables = MC_get_local_variables_values(current_stack->context); - st->stack_pointer = MC_get_stack_pointer(current_stack->context, heap); + st->stack_frames = MC_unwind_stack_frames(current_stack->context); + st->local_variables = MC_get_local_variables_values(st->stack_frames); + + unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp; + st->stack_pointer = ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap))); + st->real_address = current_stack->address; xbt_dynar_push(res, &st); (*snapshot)->stack_sizes = xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t)); @@ -507,11 +438,6 @@ mc_snapshot_t MC_take_snapshot(int num_state){ mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1); snapshot->nb_processes = xbt_swag_size(simix_global->process_list); - if(MC_USE_SNAPSHOT_HASH) { - snapshot->hash = mc_hash_processes_state(num_state); - } else { - snapshot->hash = 0; - } /* Save the std heap and the writable mapped pages of libsimgrid and binary */ MC_get_memory_regions(snapshot); @@ -520,6 +446,14 @@ 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, snapshot->regions[0]->data); + if(_sg_mc_hash && snapshot->stacks!=NULL) { + snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks); + } else { + snapshot->hash = 0; + } + } + else { + snapshot->hash = 0; } if(num_state > 0) @@ -537,6 +471,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); }