X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41ac7e58ef132dea8cea9addf213671ae38229ac..bfed6d5d4681739a8f146571c3d2f09798d0ecf4:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 0cde2167f2..0fd0907963 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -39,10 +39,12 @@ 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 void get_hash_global(char *snapshot_hash, void *data1, void *data2); +static void get_hash_local(char *snapshot_hash, xbt_dynar_t stacks); + 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,10 +74,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->region_type[snapshot->num_reg] = type; - snapshot->num_reg++; + snapshot->regions[type] = new_reg; return; } @@ -135,10 +134,6 @@ void MC_init_memory_map_info(){ } -mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ - return MC_take_snapshot(); -} - mc_snapshot_t MC_take_snapshot() { int raw_mem = (mmalloc_get_current_heap() == raw_heap); @@ -163,7 +158,7 @@ mc_snapshot_t MC_take_snapshot() 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_bytes_used = mmalloc_get_bytes_used(std_heap); - heap = snapshot->regions[snapshot->num_reg - 1]->data; + heap = snapshot->regions[0]->data; } i++; } else{ @@ -204,9 +199,12 @@ mc_snapshot_t MC_take_snapshot() snapshot->to_ignore = take_snapshot_ignore(); - if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")) + if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){ snapshot->stacks = take_snapshot_stacks(&snapshot, heap); - + get_hash_global(snapshot->hash_global, snapshot->regions[2]->data, snapshot->regions[1]->data); + get_hash_local(snapshot->hash_local, snapshot->stacks); + } + free_memory_map(maps); MC_UNSET_RAW_MEM; @@ -221,7 +219,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]); } @@ -230,10 +228,9 @@ 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_free(snapshot->regions); xbt_dynar_free(&(snapshot->stacks)); xbt_dynar_free(&(snapshot->to_ignore)); xbt_free(snapshot); @@ -245,7 +242,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; @@ -260,7 +257,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; @@ -310,7 +307,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; @@ -325,7 +322,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; @@ -463,10 +460,13 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) return variables; } - to_append = bprintf("ip=%s\n", frame_name); + to_append = bprintf("frame_name=%s\n", frame_name); xbt_strbuff_append(variables, to_append); xbt_free(to_append); - + to_append = bprintf("ip=%lx\n", ip); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); + true_ip = (long)frame->low_pc + (long)off; /* Get frame pointer */ @@ -498,7 +498,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; @@ -546,7 +546,7 @@ 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){ 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); @@ -616,6 +616,10 @@ void snapshot_stack_free_voidp(void *s){ snapshot_stack_free((mc_snapshot_stack_t) * (void **) s); } +mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ + return MC_take_snapshot(); +} + void *MC_snapshot(void){ return simcall_mc_snapshot(); @@ -633,6 +637,103 @@ void variable_value_free_voidp(void* v){ variable_value_free((variable_value_t) * (void **)v); } +static void get_hash_global(char *snapshot_hash, void *data1, void *data2){ + + unsigned int cursor = 0; + size_t offset; + global_variable_t current_var; + void *addr_pointed = NULL; + + void *res; + + xbt_strbuff_t clear = xbt_strbuff_new(); + + xbt_dynar_foreach(mc_global_variables, cursor, current_var){ + if(current_var->address < start_data_libsimgrid) + continue; + offset = (char *)current_var->address - (char *)start_data_libsimgrid; + addr_pointed = *((void **)((char *)data2 + offset)); + if((addr_pointed > start_plt_libsimgrid && addr_pointed < end_plt_libsimgrid) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE )) + continue; + res = xbt_malloc0(current_var->size);; + memcpy(res, (char*)data2 + offset, current_var->size); + xbt_strbuff_append(clear, (const char*)res); + xbt_free(res); + } + + xbt_dynar_foreach(mc_global_variables, cursor, current_var){ + if(current_var->address > start_data_libsimgrid) + break; + offset = (char *)current_var->address - (char *)start_data_binary; + addr_pointed = *((void **)((char *)data1 + offset)); + if((addr_pointed > start_plt_binary && addr_pointed < end_plt_binary) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE )) + continue; + res = xbt_malloc0(current_var->size);; + memcpy(res, (char*)data1 + offset, current_var->size); + xbt_strbuff_append(clear, (const char*)res); + xbt_free(res); + } + + xbt_sha(clear->data, snapshot_hash); + + xbt_strbuff_free(clear); + +} + +static void get_hash_local(char *snapshot_hash, xbt_dynar_t stacks){ + + xbt_dynar_t tokens = NULL, s_tokens = NULL; + unsigned int cursor1 = 0, cursor2 = 0; + mc_snapshot_stack_t current_stack; + char *frame_name = NULL; + void *addr; + + xbt_strbuff_t clear = xbt_strbuff_new(); + + while(cursor1 < xbt_dynar_length(stacks)){ + current_stack = xbt_dynar_get_as(stacks, cursor1, mc_snapshot_stack_t); + tokens = xbt_str_split(current_stack->local_variables->data, NULL); + cursor2 = 0; + while(cursor2 < xbt_dynar_length(tokens)){ + s_tokens = xbt_str_split(xbt_dynar_get_as(tokens, cursor2, char *), "="); + if(xbt_dynar_length(s_tokens) > 1){ + if(strcmp(xbt_dynar_get_as(s_tokens, 0, char *), "frame_name") == 0){ + xbt_free(frame_name); + frame_name = xbt_strdup(xbt_dynar_get_as(s_tokens, 1, char *)); + xbt_strbuff_append(clear, (const char*)xbt_dynar_get_as(tokens, cursor2, char *)); + cursor2++; + xbt_dynar_free(&s_tokens); + continue; + } + addr = (void *) strtoul(xbt_dynar_get_as(s_tokens, 1, char *), NULL, 16); + if(addr > std_heap && (char *)addr <= (char *)std_heap + STD_HEAP_SIZE){ + cursor2++; + xbt_dynar_free(&s_tokens); + continue; + } + if(is_stack_ignore_variable(frame_name, xbt_dynar_get_as(s_tokens, 0, char *))){ + cursor2++; + xbt_dynar_free(&s_tokens); + continue; + } + xbt_strbuff_append(clear, (const char *)xbt_dynar_get_as(tokens, cursor2, char *)); + } + xbt_dynar_free(&s_tokens); + cursor2++; + } + xbt_dynar_free(&tokens); + cursor1++; + } + + xbt_free(frame_name); + + xbt_sha(clear->data, snapshot_hash); + + xbt_strbuff_free(clear); + +} + + static xbt_dynar_t take_snapshot_ignore(){ if(mc_heap_comparison_ignore == NULL)