X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe50f12c40cd5b19c48e931a496bcb33ea8fb608..18618fc686c83dc040990e84e915739b2a5f0a79:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 8a5861c566..340b1b00d5 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -16,11 +16,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, void *start_text_libsimgrid; void *start_plt_libsimgrid, *end_plt_libsimgrid; +void *start_got_plt_libsimgrid, *end_got_plt_libsimgrid; void *start_plt_binary, *end_plt_binary; +void *start_got_plt_binary, *end_got_plt_binary; char *libsimgrid_path; -void *start_data_libsimgrid; +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); @@ -29,21 +31,26 @@ 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 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); memcpy(new_reg->data, start_addr, size); - XBT_DEBUG("New region : type : %d, data : %p, size : %zu", type, new_reg->data, size); + XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", type, new_reg->data, start_addr, size); return new_reg; } @@ -67,119 +74,197 @@ 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; } -void MC_take_snapshot(mc_snapshot_t snapshot) -{ - unsigned int i = 0; - s_map_region_t reg; - memory_map_t maps = get_memory_map(); +static void get_memory_regions(mc_snapshot_t snapshot){ - /* Save the std heap and the writable mapped pages of libsimgrid */ - while (i < maps->mapsize) { - reg = maps->regions[i]; - if ((reg.prot & PROT_WRITE)){ - 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); - } - 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]; + 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' && lfields[5] == NULL){ + 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); } - }else{ - i++; - } + } } - }else{ - i++; } + } - free_memory_map(maps); -} + free(line); + fclose(fp); -void MC_take_snapshot_liveness(mc_snapshot_t snapshot) -{ +} +void MC_init_memory_map_info(){ + unsigned int i = 0; s_map_region_t reg; memory_map_t maps = get_memory_map(); - int nb_reg = 0; - void *heap = NULL; - /* Save the std heap and the writable mapped pages of libsimgrid */ while (i < maps->mapsize) { reg = maps->regions[i]; if ((reg.prot & PROT_WRITE)){ - 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); - heap = snapshot->regions[nb_reg]->data; - nb_reg++; - }else if(reg.start_addr == raw_heap){ - end_raw_heap = reg.end_addr; - } - i++; - } else { + if (maps->regions[i].pathname != NULL){ 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); 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); + if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize) + start_bss_libsimgrid = reg.start_addr; + }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ + start_data_binary = reg.start_addr; + 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){ + start_bss_binary = 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++; } + }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){ + maestro_stack_start = reg.start_addr; + maestro_stack_end = reg.end_addr; i++; } } - }else if ((reg.prot & PROT_READ)){ + }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){ 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; - } + }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ + start_text_binary = reg.start_addr; } } - i++; - }else{ - i++; } + i++; } + + free_memory_map(maps); + +} + +mc_snapshot_t MC_take_snapshot() +{ - snapshot->stacks = take_snapshot_stacks(heap); + int raw_mem = (mmalloc_get_current_heap() == raw_heap); - free_memory_map(maps); + 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); + + /* Save the std heap and the writable mapped pages of libsimgrid and binary */ + get_memory_regions(snapshot); + + snapshot->to_ignore = take_snapshot_ignore(); + + if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){ + snapshot->stacks = take_snapshot_stacks(&snapshot, snapshot->regions[0]->data); + get_hash_global(snapshot->hash_global, snapshot->regions[1]->data, snapshot->regions[2]->data); + get_hash_local(snapshot->hash_local, snapshot->stacks); + } + + MC_UNSET_RAW_MEM; + + if(raw_mem) + MC_SET_RAW_MEM; + + return 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]); } @@ -188,9 +273,12 @@ 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->stack_sizes); + xbt_dynar_free(&(snapshot->stacks)); + xbt_dynar_free(&(snapshot->to_ignore)); xbt_free(snapshot); } @@ -200,20 +288,22 @@ 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_not_found = 1; + int i, plt_found = 0; unsigned long int size, offset; - char *command = bprintf( "objdump --section-headers %s", libsimgrid_path); + char *command = bprintf("objdump --section-headers %s", libsimgrid_path); fp = popen(command, "r"); - if(fp == NULL) + if(fp == NULL){ perror("popen failed"); + xbt_abort(); + } - while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) { + while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { if(n == 0) continue; @@ -239,15 +329,21 @@ void get_libsimgrid_plt_section(){ offset = strtoul(lfields[5], NULL, 16); start_plt_libsimgrid = (char *)start_text_libsimgrid + offset; end_plt_libsimgrid = (char *)start_plt_libsimgrid + size; - plt_not_found = 0; - } + plt_found++; + }else if(strcmp(lfields[1], ".got.plt") == 0){ + size = strtoul(lfields[2], NULL, 16); + offset = strtoul(lfields[5], NULL, 16); + start_got_plt_libsimgrid = (char *)start_text_libsimgrid + offset; + end_got_plt_libsimgrid = (char *)start_got_plt_libsimgrid + size; + plt_found++; + } + } - } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); } @@ -257,20 +353,22 @@ 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_not_found = 1; - unsigned long int size, offset; + int i, plt_found = 0; + unsigned long int size; char *command = bprintf( "objdump --section-headers %s", xbt_binary_name); fp = popen(command, "r"); - if(fp == NULL) + if(fp == NULL){ perror("popen failed"); + xbt_abort(); + } - while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) { + while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { if(n == 0) continue; @@ -293,18 +391,22 @@ void get_binary_plt_section(){ if(i>=6){ if(strcmp(lfields[1], ".plt") == 0){ size = strtoul(lfields[2], NULL, 16); - offset = strtoul(lfields[5], NULL, 16); - start_plt_binary = (char *)start_text_binary + offset; + start_plt_binary = (void *)strtoul(lfields[3], NULL, 16); end_plt_binary = (char *)start_plt_binary + size; - plt_not_found = 0; - } + plt_found++; + }else if(strcmp(lfields[1], ".got.plt") == 0){ + size = strtoul(lfields[2], NULL, 16); + start_got_plt_binary = (char *)strtoul(lfields[3], NULL, 16); + end_got_plt_binary = (char *)start_got_plt_binary + size; + plt_found++; + } } } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); } @@ -320,18 +422,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); 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; @@ -360,9 +464,8 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) unw_cursor_t c; int ret; - //char *stack_name; - char buf[512], frame_name[256]; + char frame_name[256]; ret = unw_init_local(&c, (unw_context_t *)stack_context); if(ret < 0){ @@ -370,12 +473,10 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) xbt_abort(); } - //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; - 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; @@ -388,30 +489,30 @@ 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){ 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); - - } - - xbt_strbuff_append(variables, bprintf("ip=%-32s\n", buf)); + unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off); frame = xbt_dict_get_or_null(mc_local_variables, frame_name); if(frame == NULL){ - ret = unw_step(&c); - continue; + xbt_dynar_free(&compose); + xbt_dict_cursor_free(&dict_cursor); + return variables; } + 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", (unsigned long)ip); + xbt_strbuff_append(variables, to_append); + xbt_free(to_append); + true_ip = (long)frame->low_pc + (long)off; /* Get frame pointer */ @@ -443,8 +544,9 @@ 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 ; + xbt_dynar_reset(compose); } break; default : @@ -463,8 +565,6 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) frame_found = 0; cursor = 0; - //XBT_INFO("Frame %s", frame->name); - xbt_dict_foreach(frame->variables, dict_cursor, variable_name, current_variable){ if(current_variable->location != NULL){ switch(current_variable->location->type){ @@ -493,43 +593,49 @@ 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_INFO("Variable : %s - value : %lx", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res); - 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(*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) == NULL){ - //XBT_INFO("Variable : %s - address : NULL", current_variable->name); - xbt_strbuff_append(variables, bprintf("%s=NULL\n", current_variable->name)); + 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){ + 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_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=%zd\n", current_variable->name, (size_t)*((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))); + 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{ + 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); } } + xbt_dynar_reset(compose); }else{ - //XBT_INFO("Variable %s undefined", current_variable->name); - 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_INFO("Variable : %s, no location", current_variable->name); - 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); } } ret = unw_step(&c); - - //XBT_INFO(" "); } - //free(stack_name); + xbt_dynar_free(&compose); + xbt_dict_cursor_free(&dict_cursor); return variables; @@ -545,3 +651,155 @@ 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); +} + +mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ + return MC_take_snapshot(); +} + +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 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 = NULL; + + xbt_strbuff_t clear = xbt_strbuff_new(); + + xbt_dynar_foreach(mc_global_variables, cursor, current_var){ + if(current_var->address < start_data_libsimgrid){ /* binary */ + offset = (char *)current_var->address - (char *)start_data_binary; + addr_pointed = *((void **)((char *)data2 + 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 + 1); + memset(res, 0, current_var->size + 1); + memcpy(res, (char*)data2 + offset, current_var->size); + }else{ /* libsimgrid */ + offset = (char *)current_var->address - (char *)start_data_libsimgrid; + addr_pointed = *((void **)((char *)data1 + 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 + 1); + memset(res, 0, current_var->size + 1); + memcpy(res, (char*)data1 + offset, current_var->size); + } + if(res != NULL){ + xbt_strbuff_append(clear, (const char*)res); + xbt_free(res); + res = NULL; + } + } + + 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) + 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; + +}