X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed..3dd60a862d49627a1c169b4be980456fe13854f9:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 832005f125..ae0262150f 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -21,9 +21,6 @@ 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, *start_bss_libsimgrid; -void *start_data_binary, *start_bss_binary; -void *start_text_binary; /************************************ Free functions **************************************/ /*****************************************************************************************/ @@ -177,7 +174,7 @@ static void MC_get_memory_regions(mc_snapshot_t snapshot){ } tok = strtok(lfields[0], "-"); start_addr1 = (void *)strtoul(tok, NULL, 16); - if(lfields[1][1] == 'w' && lfields[5] == NULL){ + if(lfields[1][1] == 'w'){ if(start_addr1 == std_heap){ /* Std_heap ? */ tok = strtok(NULL, "-"); end_addr = (void *)strtoul(tok, NULL, 16); @@ -206,53 +203,71 @@ static void MC_get_memory_regions(mc_snapshot_t snapshot){ } +/** @brief Find the range of the different memory segments and binary paths */ void MC_init_memory_map_info(){ unsigned int i = 0; s_map_region_t reg; memory_map_t maps = MC_get_memory_map(); + maestro_stack_start = NULL; + maestro_stack_end = NULL; + libsimgrid_path = NULL; + while (i < maps->mapsize) { reg = maps->regions[i]; - if ((reg.prot & PROT_WRITE)){ - if (maps->regions[i].pathname != NULL){ - 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 (!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++; - } - }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){ + if (maps->regions[i].pathname == NULL) { + // Nothing to do + } + else if ((reg.prot & PROT_WRITE) && !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) && (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; + }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ + if(libsimgrid_path == NULL) 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++; } - + + xbt_assert(maestro_stack_start, "maestro_stack_start"); + xbt_assert(maestro_stack_end, "maestro_stack_end"); + xbt_assert(libsimgrid_path, "libsimgrid_path&"); + MC_free_memory_map(maps); } +mc_object_info_t MC_find_object_address(memory_map_t maps, char* name) { + mc_object_info_t result = MC_new_object_info(); + result->file_name = xbt_strdup(name); + result->start_data = NULL; + result->start_text = NULL; + + unsigned int i = 0; + s_map_region_t reg; + int len = strlen(basename(name)); + while (i < maps->mapsize) { + reg = maps->regions[i]; + if (maps->regions[i].pathname == NULL || memcmp(basename(maps->regions[i].pathname), basename(name), len)){ + // Nothing to do + } + else if ((reg.prot & PROT_WRITE)){ + result->start_data = reg.start_addr; + i++; + reg = maps->regions[i]; + }else if (reg.prot & PROT_READ) { + result->start_text = reg.start_addr; + } + i++; + } + + xbt_assert(result->file_name); + xbt_assert(result->start_data); + xbt_assert(result->start_text); + + return result; +} + void MC_get_libsimgrid_plt_section(){ FILE *fp; @@ -264,7 +279,7 @@ void MC_get_libsimgrid_plt_section(){ int i, plt_found = 0; unsigned long int size, offset; - char *command = bprintf("objdump --section-headers %s", libsimgrid_path); + char *command = bprintf("LANG=C objdump --section-headers %s", libsimgrid_path); fp = popen(command, "r"); @@ -329,7 +344,7 @@ void MC_get_binary_plt_section(){ int i, plt_found = 0; unsigned long int size; - char *command = bprintf( "objdump --section-headers %s", xbt_binary_name); + char *command = bprintf("LANG=C objdump --section-headers %s", xbt_binary_name); fp = popen(command, "r"); @@ -516,10 +531,10 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ if(!strcmp(frame_name, "smx_ctx_sysv_wrapper")) /* Stop before context switch with maestro */ stop = 1; - if((long)ip > (long)start_text_libsimgrid) - frame = xbt_dict_get_or_null(mc_local_variables_libsimgrid, frame_name); + if((long)ip > (long) mc_libsimgrid_info->start_text) + frame = xbt_dict_get_or_null(mc_libsimgrid_info->local_variables, frame_name); else - frame = xbt_dict_get_or_null(mc_local_variables_binary, frame_name); + frame = xbt_dict_get_or_null(mc_binary_info->local_variables, frame_name); if(frame == NULL){ ret = unw_step(&c); @@ -576,7 +591,7 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ xbt_dynar_foreach(frame->variables, cursor, current_variable){ - if((long)ip > (long)start_text_libsimgrid) + if((long)ip > (long)mc_libsimgrid_info->start_text) region_type = 1; else region_type = 2; @@ -725,7 +740,7 @@ static void MC_dump_checkpoint_ignore(mc_snapshot_t snapshot){ } -mc_snapshot_t MC_take_snapshot(){ +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); @@ -741,7 +756,8 @@ mc_snapshot_t MC_take_snapshot(){ //MC_get_hash_local(snapshot->hash_local, snapshot->stacks); } - MC_dump_checkpoint_ignore(snapshot); + if(num_state > 0) + MC_dump_checkpoint_ignore(snapshot); return snapshot; @@ -756,7 +772,7 @@ void MC_restore_snapshot(mc_snapshot_t snapshot){ } mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ - return MC_take_snapshot(); + return MC_take_snapshot(1); } void *MC_snapshot(void){