X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3dd60a862d49627a1c169b4be980456fe13854f9..7db2327a25dd339d72e5be32a44190d3b2191577:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index ae0262150f..7e8d185ca7 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -4,24 +4,26 @@ /* 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. */ -#include +#define _GNU_SOURCE +#include +#include #include "mc_private.h" #include "xbt/module.h" #include "../simix/smx_private.h" #include +#include + +#include "mc_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); -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; +static void MC_find_object_address(memory_map_t maps, mc_object_info_t result); + /************************************ Free functions **************************************/ /*****************************************************************************************/ @@ -203,7 +205,7 @@ static void MC_get_memory_regions(mc_snapshot_t snapshot){ } -/** @brief Find the range of the different memory segments and binary paths */ +/** @brief Finds the range of the different memory segments and binary paths */ void MC_init_memory_map_info(){ unsigned int i = 0; @@ -222,7 +224,7 @@ void MC_init_memory_map_info(){ 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; - }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ + } 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); } @@ -237,163 +239,57 @@ void MC_init_memory_map_info(){ } -mc_object_info_t MC_find_object_address(memory_map_t maps, char* name) { +static void MC_post_process_types(mc_object_info_t info) { + // Nothing here +} + +/** \brief Finds informations about a given shared object/executable */ +mc_object_info_t MC_find_object_info(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; + MC_find_object_address(maps, result); + MC_dwarf_get_variables(result); + MC_post_process_types(result); + return result; +} + +/** \brief Fills the position of the .bss and .data sections. */ +static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { unsigned int i = 0; s_map_region_t reg; - int len = strlen(basename(name)); + const char* name = basename(result->file_name); while (i < maps->mapsize) { reg = maps->regions[i]; - if (maps->regions[i].pathname == NULL || memcmp(basename(maps->regions[i].pathname), basename(name), len)){ + if (maps->regions[i].pathname == NULL || strcmp(basename(maps->regions[i].pathname), name)) { // 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; + xbt_assert(!result->start_rw, + "Multiple read-write segments for %s, not supported", + maps->regions[i].pathname); + result->start_rw = reg.start_addr; + result->end_rw = reg.end_addr; + } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){ + xbt_assert(!result->start_exec, + "Multiple executable segments for %s, not supported", + maps->regions[i].pathname); + result->start_exec = reg.start_addr; + result->end_exec = reg.end_addr; + } + else if((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) { + xbt_assert(!result->start_ro, + "Multiple read only segments for %s, not supported", + maps->regions[i].pathname); + result->start_ro = reg.start_addr; + result->end_ro = reg.end_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; - 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 xbt_getline */ - - char *lfields[7]; - int i, plt_found = 0; - unsigned long int size, offset; - - char *command = bprintf("LANG=C objdump --section-headers %s", libsimgrid_path); - - fp = popen(command, "r"); - - if(fp == NULL){ - perror("popen failed"); - xbt_abort(); - } - - while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { - - if(n == 0) - continue; - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - lfields[0] = strtok(line, " "); - - if(lfields[0] == NULL) - continue; - - 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>=6){ - if(strcmp(lfields[1], ".plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - offset = strtoul(lfields[5], NULL, 16); - start_plt_libsimgrid = (char *)start_text_libsimgrid + offset; - end_plt_libsimgrid = (char *)start_plt_libsimgrid + size; - 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++; - } - - } - - } - - xbt_free(command); - xbt_free(line); - pclose(fp); - -} - -void MC_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 xbt_getline */ - - char *lfields[7]; - int i, plt_found = 0; - unsigned long int size; - - char *command = bprintf("LANG=C objdump --section-headers %s", xbt_binary_name); - - fp = popen(command, "r"); - - if(fp == NULL){ - perror("popen failed"); - xbt_abort(); - } - - while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { - - if(n == 0) - continue; - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - lfields[0] = strtok(line, " "); - - if(lfields[0] == NULL) - continue; - - 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>=6){ - if(strcmp(lfields[1], ".plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - start_plt_binary = (void *)strtoul(lfields[3], NULL, 16); - end_plt_binary = (char *)start_plt_binary + size; - 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++; - } - } - - - } - - xbt_free(command); - xbt_free(line); - pclose(fp); - + xbt_assert(result->start_rw); + xbt_assert(result->start_exec); } /************************************* Take Snapshot ************************************/ @@ -493,6 +389,8 @@ static void MC_get_hash_local(char *snapshot_hash, xbt_dynar_t stacks){ } + + static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ unw_cursor_t c; @@ -512,11 +410,9 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ unsigned int cursor = 0; dw_variable_t current_variable; dw_location_entry_t entry = NULL; - dw_location_t location_entry = NULL; - unw_word_t res; int frame_found = 0, region_type; void *frame_pointer_address = NULL; - long true_ip, value; + long true_ip; int stop = 0; xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); @@ -531,7 +427,7 @@ 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) mc_libsimgrid_info->start_text) + if((long)ip > (long) mc_libsimgrid_info->start_exec) frame = xbt_dict_get_or_null(mc_libsimgrid_info->local_variables, frame_name); else frame = xbt_dict_get_or_null(mc_binary_info->local_variables, frame_name); @@ -552,31 +448,7 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ entry = xbt_dynar_get_as(frame->frame_base->location.loclist, cursor, dw_location_entry_t); if((true_ip >= entry->lowpc) && (true_ip < entry->highpc)){ frame_found = 1; - switch(entry->location->type){ - case e_dw_compose: - if(xbt_dynar_length(entry->location->location.compose) > 1){ - frame_pointer_address = NULL; /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(entry->location->location.compose, 0, dw_location_t); - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - frame_pointer_address = (void*)(long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - frame_pointer_address = (void*)((long)res + location_entry->location.breg_op.offset); - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } - } - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } + frame_pointer_address = (void*) MC_dwarf_resolve_location(&c, entry->location, NULL); } cursor++; } @@ -591,7 +463,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)mc_libsimgrid_info->start_text) + if((long)ip > (long)mc_libsimgrid_info->start_exec) region_type = 1; else region_type = 2; @@ -603,43 +475,11 @@ static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ new_var->type = strdup(current_variable->type_origin); new_var->region= region_type; - if(current_variable->address.location != NULL){ - switch(current_variable->address.location->type){ - case e_dw_compose: - if(xbt_dynar_length(current_variable->address.location->location.compose) > 1){ - /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(current_variable->address.location->location.compose, 0, dw_location_t); - - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - value = (long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - value = (long)res + location_entry->location.breg_op.offset; - break; - case e_dw_fbregister_op: - if(frame_pointer_address != NULL) - value = (long)((char *)frame_pointer_address + location_entry->location.fbreg_op); - else - value = 0; - break; - default: - value = 0; /* FIXME : implement other cases (with optimizations enabled)*/ - break; - } - - if(value) - new_var->address = (void *)value; - else - new_var->address = NULL; - } - break; - default : - break; - } + /* if(current_variable->address!=NULL) { + new_var->address = current_variable->address; + } else */ + if(current_variable->location != NULL){ + new_var->address = (void*) MC_dwarf_resolve_location(&c, current_variable->location, frame_pointer_address); } xbt_dynar_push(variables, &new_var);