X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c991ec54a886fe3f3e1460353790938e88a7af1f..3a9ba94edbd1ef8375ba5e7bca9b02f45d4d8b89:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index b3dd6ca964..46b70965a3 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -23,7 +23,6 @@ char *libsimgrid_path; void *start_data_libsimgrid, *start_bss_libsimgrid; void *start_data_binary, *start_bss_binary; void *start_text_binary; -void *end_raw_heap; static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size); static void MC_region_restore(mc_mem_region_t reg); @@ -32,17 +31,17 @@ static void MC_region_destroy(mc_mem_region_t reg); static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size); static void add_value(xbt_dynar_t *list, const char *type, unsigned long int val); -static xbt_dynar_t take_snapshot_stacks(void *heap); +static xbt_dynar_t take_snapshot_stacks(mc_snapshot_t *s, void *heap); static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap); static void print_local_variables_values(xbt_dynar_t all_variables); static void *get_stack_pointer(void *stack_context, void *heap); static void snapshot_stack_free(mc_snapshot_stack_t s); +static xbt_dynar_t take_snapshot_ignore(void); static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size) { mc_mem_region_t new_reg = xbt_new0(s_mc_mem_region_t, 1); - new_reg->type = type; new_reg->start_addr = start_addr; new_reg->size = size; new_reg->data = xbt_malloc0(size); @@ -72,9 +71,7 @@ static void MC_region_destroy(mc_mem_region_t reg) static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size) { mc_mem_region_t new_reg = MC_region_new(type, start_addr, size); - snapshot->regions = xbt_realloc(snapshot->regions, (snapshot->num_reg + 1) * sizeof(mc_mem_region_t)); - snapshot->regions[snapshot->num_reg] = new_reg; - snapshot->num_reg++; + snapshot->regions[type] = new_reg; return; } @@ -106,8 +103,9 @@ void MC_init_memory_map_info(){ start_bss_binary = reg.start_addr; i++; } - }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){ - end_raw_heap = reg.end_addr; + }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){ + maestro_stack_start = reg.start_addr; + maestro_stack_end = reg.end_addr; i++; } } @@ -139,17 +137,16 @@ mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ mc_snapshot_t MC_take_snapshot() { - int raw_mem = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1); + snapshot->nb_processes = xbt_swag_size(simix_global->process_list); unsigned int i = 0; s_map_region_t reg; memory_map_t maps = get_memory_map(); - int nb_reg = 0; void *heap = NULL; size_t size = 0; void *start = NULL; @@ -161,16 +158,14 @@ mc_snapshot_t MC_take_snapshot() if (maps->regions[i].pathname == NULL){ if (reg.start_addr == std_heap){ // only save the std heap (and not the raw one) MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); - snapshot->heap_chunks_used = mmalloc_get_chunks_used(std_heap); - heap = snapshot->regions[nb_reg]->data; - nb_reg++; + snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + heap = snapshot->regions[0]->data; } i++; } else{ if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ size = (char*)reg.end_addr - (char*)reg.start_addr; start = reg.start_addr; - nb_reg++; i++; reg = maps->regions[i]; if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){ @@ -179,13 +174,13 @@ mc_snapshot_t MC_take_snapshot() i++; } MC_snapshot_add_region(snapshot, 1, start, size); - }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){ - end_raw_heap = reg.end_addr; + }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){ + maestro_stack_start = reg.start_addr; + maestro_stack_end = reg.end_addr; i++; } else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ size = (char*)reg.end_addr - (char*)reg.start_addr; start = reg.start_addr; - nb_reg++; i++; reg = maps->regions[i]; if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && reg.start_addr != std_heap && reg.start_addr != raw_heap && i < maps->mapsize){ @@ -203,8 +198,10 @@ mc_snapshot_t MC_take_snapshot() } } + snapshot->to_ignore = take_snapshot_ignore(); + if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")) - snapshot->stacks = take_snapshot_stacks(heap); + snapshot->stacks = take_snapshot_stacks(&snapshot, heap); free_memory_map(maps); @@ -220,7 +217,7 @@ mc_snapshot_t MC_take_snapshot() void MC_restore_snapshot(mc_snapshot_t snapshot) { unsigned int i; - for(i=0; i < snapshot->num_reg; i++){ + for(i=0; i < NB_REGIONS; i++){ MC_region_restore(snapshot->regions[i]); } @@ -229,10 +226,11 @@ void MC_restore_snapshot(mc_snapshot_t snapshot) void MC_free_snapshot(mc_snapshot_t snapshot) { unsigned int i; - for(i=0; i < snapshot->num_reg; i++) + for(i=0; i < NB_REGIONS; i++) MC_region_destroy(snapshot->regions[i]); xbt_dynar_free(&(snapshot->stacks)); + xbt_dynar_free(&(snapshot->to_ignore)); xbt_free(snapshot); } @@ -242,7 +240,7 @@ void get_libsimgrid_plt_section(){ FILE *fp; char *line = NULL; /* Temporal storage for each line that is readed */ ssize_t read; /* Number of bytes readed */ - size_t n = 0; /* Amount of bytes to read by getline */ + size_t n = 0; /* Amount of bytes to read by xbt_getline */ char *lfields[7]; int i, plt_found = 0; @@ -257,7 +255,7 @@ void get_libsimgrid_plt_section(){ xbt_abort(); } - while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) { + while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { if(n == 0) continue; @@ -296,8 +294,8 @@ void get_libsimgrid_plt_section(){ } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); } @@ -307,7 +305,7 @@ void get_binary_plt_section(){ FILE *fp; char *line = NULL; /* Temporal storage for each line that is readed */ ssize_t read; /* Number of bytes readed */ - size_t n = 0; /* Amount of bytes to read by getline */ + size_t n = 0; /* Amount of bytes to read by xbt_getline */ char *lfields[7]; int i, plt_found = 0; @@ -322,7 +320,7 @@ void get_binary_plt_section(){ xbt_abort(); } - while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) { + while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { if(n == 0) continue; @@ -359,8 +357,8 @@ void get_binary_plt_section(){ } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); } @@ -376,19 +374,20 @@ static void add_value(xbt_dynar_t *list, const char *type, unsigned long int val xbt_dynar_push(*list, &value); } -static xbt_dynar_t take_snapshot_stacks(void *heap){ +static xbt_dynar_t take_snapshot_stacks(mc_snapshot_t *snapshot, void *heap){ - xbt_dynar_t res = xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), NULL); + xbt_dynar_t res = xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), snapshot_stack_free_voidp); - unsigned int cursor1 = 0; + unsigned int cursor = 0; stack_region_t current_stack; - xbt_dynar_foreach(stacks_areas, cursor1, current_stack){ + xbt_dynar_foreach(stacks_areas, cursor, current_stack){ mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); st->local_variables = get_local_variables_values(current_stack->context, heap); st->stack_pointer = get_stack_pointer(current_stack->context, heap); - st->size_used = current_stack->size - ((char *)st->stack_pointer - (char *)((char *)heap + ((char *)current_stack->address - (char *)std_heap))); xbt_dynar_push(res, &st); + (*snapshot)->stack_sizes = xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t)); + (*snapshot)->stack_sizes[cursor] = current_stack->size - ((char *)st->stack_pointer - (char *)((char *)heap + ((char *)current_stack->address - (char *)std_heap))); } return res; @@ -429,7 +428,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) unw_word_t ip, sp, off; dw_frame_t frame; - xbt_dynar_t compose = xbt_dynar_new(sizeof(variable_value_t), NULL); + xbt_dynar_t compose = xbt_dynar_new(sizeof(variable_value_t), variable_value_free_voidp); xbt_strbuff_t variables = xbt_strbuff_new(); xbt_dict_cursor_t dict_cursor; @@ -442,6 +441,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) int frame_found = 0; void *frame_pointer_address = NULL; long true_ip; + char *to_append; while(ret >= 0){ @@ -452,10 +452,18 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) frame = xbt_dict_get_or_null(mc_local_variables, frame_name); - if(frame == NULL) + if(frame == NULL){ + xbt_dynar_free(&compose); + xbt_dict_cursor_free(&dict_cursor); return variables; + } - xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name)); + to_append = bprintf("ip=%lx\n", ip); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); + to_append = bprintf("frame_name=%s\n", frame_name); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); true_ip = (long)frame->low_pc + (long)off; @@ -488,7 +496,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) cursor2++; } - if(xbt_dynar_length(compose) > 0){ + if(!xbt_dynar_is_empty(compose)){ frame_pointer_address = xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address ; } break; @@ -536,27 +544,39 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) cursor++; } - if(xbt_dynar_length(compose) > 0){ + if(!xbt_dynar_is_empty(compose)){ if(strcmp(xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->type, "value") == 0){ - xbt_strbuff_append(variables, bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res)); + to_append = bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); }else{ if((long)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address < 0 || *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) == NULL){ - xbt_strbuff_append(variables, bprintf("%s=NULL\n", current_variable->name)); + to_append = bprintf("%s=NULL\n", current_variable->name); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); }else if(((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) > 0xffffffff) || ((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) < (long)start_text_binary)){ - xbt_strbuff_append(variables, bprintf("%s=%d\n", current_variable->name, (int)(long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address))); + to_append = bprintf("%s=%u\n", current_variable->name, (unsigned int)(long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); }else{ - xbt_strbuff_append(variables, bprintf("%s=%p\n", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address))); + to_append = bprintf("%s=%p\n", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); } } }else{ - xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name)); + to_append = bprintf("%s=undefined\n", current_variable->name); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); } break; default : break; } }else{ - xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name)); + to_append = bprintf("%s=undefined\n", current_variable->name); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); } } @@ -564,6 +584,9 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) } + xbt_dynar_free(&compose); + xbt_dict_cursor_free(&dict_cursor); + return variables; } @@ -596,3 +619,38 @@ void *MC_snapshot(void){ return simcall_mc_snapshot(); } + +void variable_value_free(variable_value_t v){ + if(v){ + xbt_free(v->type); + xbt_free(v); + } +} + +void variable_value_free_voidp(void* v){ + variable_value_free((variable_value_t) * (void **)v); +} + +static xbt_dynar_t take_snapshot_ignore(){ + + if(mc_heap_comparison_ignore == NULL) + return NULL; + + xbt_dynar_t cpy = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp); + + unsigned int cursor = 0; + mc_heap_ignore_region_t current_region; + + xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){ + mc_heap_ignore_region_t new_region = NULL; + new_region = xbt_new0(s_mc_heap_ignore_region_t, 1); + new_region->address = current_region->address; + new_region->size = current_region->size; + new_region->block = current_region->block; + new_region->fragment = current_region->fragment; + xbt_dynar_push(cpy, &new_region); + } + + return cpy; + +}