X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae7eb908102a9049410dd066d4a6c521344bac28..2856679722f2a932bcdd28f50776353829a61576:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 81235b1c80..bbe8fd6782 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -18,8 +18,9 @@ void *start_text_libsimgrid; void *start_plt_libsimgrid, *end_plt_libsimgrid; void *start_plt_binary, *end_plt_binary; char *libsimgrid_path; -void *start_data_libsimgrid; +void *start_data_libsimgrid, *start_bss_libsimgrid; 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); @@ -29,9 +30,11 @@ static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start 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_strbuff_t get_local_variables_values(stack_region_t stack, 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(stack_region_t stack, void *heap); +static void *get_stack_pointer(void *stack_context, void *heap); + +static void snapshot_stack_free(mc_snapshot_stack_t s); static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size) { @@ -86,21 +89,88 @@ void MC_take_snapshot(mc_snapshot_t 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); } + i++; } else { if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); + i++; + reg = maps->regions[i]; + while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){ + MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); + i++; + reg = maps->regions[i]; + } + }else{ + i++; } } + }else{ + i++; } - i++; } free_memory_map(maps); } -void MC_take_snapshot_liveness(mc_snapshot_t snapshot) +void MC_init_memory_map_info(){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + MC_SET_RAW_MEM; + + unsigned int i = 0; + s_map_region_t reg; + memory_map_t maps = get_memory_map(); + + while (i < maps->mapsize) { + reg = maps->regions[i]; + if ((reg.prot & PROT_WRITE)){ + if (maps->regions[i].pathname == NULL){ + if(reg.start_addr == raw_heap){ + end_raw_heap = reg.end_addr; + } + } else { + if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ + start_data_libsimgrid = reg.start_addr; + i++; + reg = maps->regions[i]; + if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize) + start_bss_libsimgrid = reg.start_addr; + } + } + }else if ((reg.prot & PROT_READ)){ + if (maps->regions[i].pathname != NULL){ + if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ + start_text_libsimgrid = reg.start_addr; + libsimgrid_path = strdup(maps->regions[i].pathname); + }else{ + if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ + start_text_binary = reg.start_addr; + } + } + } + } + i++; + } + + free_memory_map(maps); + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + +} + +mc_snapshot_t MC_take_snapshot_liveness() { + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + MC_SET_RAW_MEM; + + mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1); + unsigned int i = 0; s_map_region_t reg; memory_map_t maps = get_memory_map(); @@ -108,7 +178,7 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot) void *heap = NULL; /* Save the std heap and the writable mapped pages of libsimgrid */ - while (i < maps->mapsize && nb_reg < 3) { + while (i < maps->mapsize) { reg = maps->regions[i]; if ((reg.prot & PROT_WRITE)){ if (maps->regions[i].pathname == NULL){ @@ -116,17 +186,29 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot) MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); heap = snapshot->regions[nb_reg]->data; nb_reg++; + }else if(reg.start_addr == raw_heap){ + end_raw_heap = reg.end_addr; } + i++; } else { if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); - nb_reg++; start_data_libsimgrid = reg.start_addr; + nb_reg++; + i++; + reg = maps->regions[i]; + while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){ + MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); + i++; + reg = maps->regions[i]; + nb_reg++; + } } else { if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); nb_reg++; } + i++; } } }else if ((reg.prot & PROT_READ)){ @@ -140,14 +222,23 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot) } } } + i++; + }else{ + i++; } - i++; } snapshot->stacks = take_snapshot_stacks(heap); free_memory_map(maps); + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + + return snapshot; + } void MC_restore_snapshot(mc_snapshot_t snapshot) @@ -165,6 +256,7 @@ void MC_free_snapshot(mc_snapshot_t snapshot) for(i=0; i < snapshot->num_reg; i++) MC_region_destroy(snapshot->regions[i]); + xbt_dynar_free(&(snapshot->stacks)); xbt_free(snapshot); } @@ -180,7 +272,10 @@ void get_libsimgrid_plt_section(){ int i, plt_not_found = 1; unsigned long int size, offset; - char *command = bprintf( "objdump --section-headers %s", libsimgrid_path); + if(libsimgrid_path == NULL) + libsimgrid_path = get_libsimgrid_path(); + + char *command = bprintf("objdump --section-headers %s", libsimgrid_path); fp = popen(command, "r"); @@ -200,14 +295,14 @@ void get_libsimgrid_plt_section(){ if(lfields[0] == NULL) continue; - if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strcmp(lfields[0], "libsimgrid.so:") == 0) + if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], libsimgrid_path, strlen(libsimgrid_path)) == 0) continue; for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) { lfields[i] = strtok(NULL, " "); } - if(i>=5){ + if(i>=6){ if(strcmp(lfields[1], ".plt") == 0){ size = strtoul(lfields[2], NULL, 16); offset = strtoul(lfields[5], NULL, 16); @@ -217,7 +312,6 @@ void get_libsimgrid_plt_section(){ } } - } free(command); @@ -257,14 +351,14 @@ void get_binary_plt_section(){ if(lfields[0] == NULL) continue; - if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strcmp(lfields[0], basename(xbt_binary_name)) == 0) + if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], basename(xbt_binary_name), strlen(xbt_binary_name)) == 0) continue; for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) { lfields[i] = strtok(NULL, " "); } - if(i>=5){ + if(i>=6){ if(strcmp(lfields[1], ".plt") == 0){ size = strtoul(lfields[2], NULL, 16); offset = strtoul(lfields[5], NULL, 16); @@ -303,8 +397,8 @@ static xbt_dynar_t take_snapshot_stacks(void *heap){ xbt_dynar_foreach(stacks_areas, cursor1, current_stack){ mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); - st->local_variables = get_local_variables_values(current_stack, heap); - st->stack_pointer = get_stack_pointer(current_stack, heap); + st->local_variables = get_local_variables_values(current_stack->context, heap); + st->stack_pointer = get_stack_pointer(current_stack->context, heap); xbt_dynar_push(res, &st); } @@ -312,13 +406,13 @@ static xbt_dynar_t take_snapshot_stacks(void *heap){ } -static void *get_stack_pointer(stack_region_t stack, void *heap){ +static void *get_stack_pointer(void *stack_context, void *heap){ unw_cursor_t c; int ret; unw_word_t sp; - ret = unw_init_local(&c, (unw_context_t *)&(((smx_ctx_sysv_t)(stack->address))->uc)); + ret = unw_init_local(&c, (unw_context_t *)stack_context); if(ret < 0){ XBT_INFO("unw_init_local failed"); xbt_abort(); @@ -330,21 +424,21 @@ static void *get_stack_pointer(stack_region_t stack, void *heap){ } -static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap){ +static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap){ unw_cursor_t c; int ret; - char *stack_name; + //char *stack_name; - char buf[512], frame_name[256]; + char frame_name[256]; - ret = unw_init_local(&c, (unw_context_t *)&(((smx_ctx_sysv_t)(stack->address))->uc)); + ret = unw_init_local(&c, (unw_context_t *)stack_context); if(ret < 0){ XBT_INFO("unw_init_local failed"); xbt_abort(); } - stack_name = strdup(((smx_process_t)((smx_ctx_sysv_t)(stack->address))->super.data)->name); + //stack_name = strdup(((smx_process_t)((smx_ctx_sysv_t)(stack->address))->super.data)->name); unw_word_t ip, sp, off; dw_frame_t frame; @@ -368,16 +462,9 @@ static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap unw_get_reg(&c, UNW_REG_IP, &ip); unw_get_reg(&c, UNW_REG_SP, &sp); - buf[0] = '\0'; - if (unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off) == 0){ - if (off) - snprintf (buf, sizeof (buf), "<%s+0x%lx>", frame_name, (long) off); - else - snprintf (buf, sizeof (buf), "<%s>", frame_name); - - } + unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off); - xbt_strbuff_append(variables, bprintf("ip=%-32s\n", buf)); + xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name)); frame = xbt_dict_get_or_null(mc_local_variables, frame_name); @@ -476,8 +563,8 @@ static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap //XBT_INFO("Variable : %s - address : NULL", current_variable->name); xbt_strbuff_append(variables, bprintf("%s=NULL\n", current_variable->name)); }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_INFO("Variable : %s - value : %d", current_variable->name, (int)(long long int)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)); - xbt_strbuff_append(variables, bprintf("%s=%d\n", current_variable->name, (int)(long long int)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address))); + //XBT_INFO("Variable : %s - value : %zd", current_variable->name, (size_t)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)); + 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))); }else{ //XBT_INFO("Variable : %s - address : %p", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)); 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))); @@ -503,7 +590,7 @@ static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap } - free(stack_name); + //free(stack_name); return variables; @@ -519,3 +606,21 @@ static void print_local_variables_values(xbt_dynar_t all_variables){ } } + +static void snapshot_stack_free(mc_snapshot_stack_t s){ + if(s){ + xbt_free(s->local_variables->data); + xbt_free(s->local_variables); + xbt_free(s); + } +} + +void snapshot_stack_free_voidp(void *s){ + snapshot_stack_free((mc_snapshot_stack_t) * (void **) s); +} + +void *MC_snapshot(void){ + + return simcall_mc_snapshot(); + +}