X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5a0234ae3d4adeb86ed57763ff23aba502a186f..d4bb65aef6bed4db7389e777dfa7828bdebd1c02:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 457776c8a2..033d77b842 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "simgrid/sg_config.h" #include "../surf/surf_private.h" @@ -18,6 +19,8 @@ #include "xbt/automaton.h" #include "xbt/dict.h" +static void MC_post_process_types(mc_object_info_t info); + XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -147,7 +150,7 @@ static void dw_location_entry_free(dw_location_entry_t e){ xbt_free(e); } -static void dw_type_free(dw_type_t t){ +void dw_type_free(dw_type_t t){ xbt_free(t->name); xbt_free(t->dw_type_id); xbt_dynar_free(&(t->members)); @@ -174,9 +177,16 @@ static void dw_variable_free_voidp(void *t){ // object_info -mc_object_info_t MC_new_object_info() { +mc_object_info_t MC_new_object_info(void) { mc_object_info_t res = xbt_new(s_mc_object_info_t, 1); res->file_name = NULL; + res->start_text = NULL; + res->start_data = NULL; + res->start_bss = NULL; + res->start_plt = NULL; + res->end_plt = NULL; + res->start_got_plt = NULL; + res->end_got_plt = NULL; res->local_variables = xbt_dict_new_homogeneous(NULL); res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); res->types = xbt_dict_new_homogeneous(NULL); @@ -444,6 +454,10 @@ static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ return location_list; } +/** \brief Finds a frame (DW_TAG_subprogram) from an DWARF offset in the rangd of this subprogram + * + * The offset can be an offset of a child DW_TAG_variable. + */ static dw_frame_t MC_dwarf_get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){ xbt_dict_cursor_t cursor = NULL; @@ -518,7 +532,12 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } -static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ +/** \brief Fill DWARf debug infomations (types, frames, variables ...). */ +void MC_dwarf_get_variables(mc_object_info_t info) { + if(MC_USE_LIBDW_TYPES) + MC_dwarf_get_variables_libdw(info); + mc_object_info_t result = info; + const char *elf_file = info->file_name; xbt_dict_t location_list = MC_dwarf_get_location_list(elf_file); @@ -529,9 +548,6 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ if(fp == NULL) perror("popen for objdump failed"); - mc_object_info_t result = MC_new_object_info(); - result->file_name = xbt_strdup(elf_file); - xbt_dict_t *local_variables = &result->local_variables; xbt_dynar_t *global_variables = &result->global_variables; xbt_dict_t *types = &result->types; @@ -745,6 +761,7 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ if(strcmp(node_type, "DW_AT_name") == 0){ var = xbt_new0(s_dw_variable_t, 1); + var->dwarf_offset = 0; var->name = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); xbt_dict_set(variables_origin, origin, xbt_strdup(var->name), NULL); @@ -781,8 +798,9 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ xbt_dynar_free(&split2); split2 = xbt_str_split(loc_expr, " "); if(strcmp(elf_file, xbt_binary_name) != 0) - var->address.address = (char *)start_text_libsimgrid + (long)((void *)strtoul(xbt_dynar_get_as(split2, xbt_dynar_length(split2) - 1, char*), NULL, 16)); + var->address.address = (char *) info->start_text + (long)((void *)strtoul(xbt_dynar_get_as(split2, xbt_dynar_length(split2) - 1, char*), NULL, 16)); else + // Why is it different ? var->address.address = (void *)strtoul(xbt_dynar_get_as(split2, xbt_dynar_length(split2) - 1, char*), NULL, 16); }else{ var->address.location = MC_dwarf_get_location(NULL, loc_expr); @@ -794,8 +812,9 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ global_address = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); xbt_str_rtrim(global_address, ")"); if(strcmp(elf_file, xbt_binary_name) != 0) - var->address.address = (char *)start_text_libsimgrid + (long)((void *)strtoul(global_address, NULL, 16)); + var->address.address = (char *) info->start_text + (long)((void *)strtoul(global_address, NULL, 16)); else + // Why is it different ? var->address.address = (void *)strtoul(global_address, NULL, 16); xbt_free(global_address); global_address = NULL; @@ -902,33 +921,30 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ } - }else if(strcmp(node_type, "(DW_TAG_base_type)") == 0 + }else if(!MC_USE_LIBDW_TYPES&&(strcmp(node_type, "(DW_TAG_base_type)") == 0 || strcmp(node_type, "(DW_TAG_enumeration_type)") == 0 - || strcmp(node_type, "(DW_TAG_enumerator)") == 0 || strcmp(node_type, "(DW_TAG_typedef)") == 0 || strcmp(node_type, "(DW_TAG_const_type)") == 0 || strcmp(node_type, "(DW_TAG_subroutine_type)") == 0 || strcmp(node_type, "(DW_TAG_volatile_type)") == 0 - || (is_pointer = !strcmp(node_type, "(DW_TAG_pointer_type)"))){ + || (is_pointer = !strcmp(node_type, "(DW_TAG_pointer_type)")))){ /* Create the and add it to the types dictionnary */ if(strcmp(node_type, "(DW_TAG_base_type)") == 0) - type_type = e_dw_base_type; + type_type = DW_TAG_base_type; else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0) - type_type = e_dw_enumeration_type; - else if(strcmp(node_type, "(DW_TAG_enumerator)") == 0) - type_type = e_dw_enumerator; + type_type = DW_TAG_enumeration_type; else if(strcmp(node_type, "(DW_TAG_typedef)") == 0) - type_type = e_dw_typedef; + type_type = DW_TAG_typedef; else if(strcmp(node_type, "(DW_TAG_const_type)") == 0) - type_type = e_dw_const_type; + type_type = DW_TAG_const_type; else if(strcmp(node_type, "(DW_TAG_pointer_type)") == 0) - type_type = e_dw_pointer_type; + type_type = DW_TAG_pointer_type; else if(strcmp(node_type, "(DW_TAG_subroutine_type)") == 0) - type_type = e_dw_subroutine_type; + type_type = DW_TAG_subroutine_type; else if(strcmp(node_type, "(DW_TAG_volatile_type)") == 0) - type_type = e_dw_volatile_type; + type_type = DW_TAG_volatile_type; strtok(xbt_dynar_get_as(split, 0, char *), "<"); origin = strdup(strtok(NULL, "<")); @@ -958,7 +974,7 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ if(strcmp(node_type, "DW_AT_byte_size") == 0){ size = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - if(type_type == e_dw_enumeration_type) + if(type_type == DW_TAG_enumeration_type) enumeration_size = size; }else if(strcmp(node_type, "DW_AT_name") == 0){ end = xbt_str_join(split, " "); @@ -985,10 +1001,11 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) type->dw_type_id = xbt_strdup(type_origin); - if(type_type == e_dw_enumerator) - type->size = enumeration_size; - else - type->size = size; + + type->byte_size = size; + // Not relevant: + type->element_count = -1; + type->members = NULL; xbt_dict_set(*types, origin, type, NULL); @@ -1073,9 +1090,11 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ if(member_end && type){ member_end = 0; + // Why are we not simply referencing, the DW_AT_type? dw_type_t member_type = xbt_new0(s_dw_type_t, 1); member_type->name = xbt_strdup(name); - member_type->size = size; + member_type->byte_size = size; + member_type->element_count = -1; member_type->is_pointer_type = is_pointer; member_type->id = (void *)strtoul(origin, NULL, 16); member_type->offset = offset; @@ -1104,11 +1123,12 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ if(struct_decl || union_decl){ type = xbt_new0(s_dw_type_t, 1); if(struct_decl) - type->type = e_dw_structure_type; + type->type = DW_TAG_structure_type; else - type->type = e_dw_union_type; + type->type = DW_TAG_union_type; type->name = xbt_strdup(name); - type->size = size; + type->byte_size = size; + type->element_count = -1; type->is_pointer_type = is_pointer; type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) @@ -1149,8 +1169,10 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ dw_type_t type = NULL; + // Read DW_TAG_subrange_type children: while(read != -1){ + // Read attributes of the DW_TAG_subrange_type: while(read != -1){ /* Wipeout the new line character */ @@ -1194,8 +1216,8 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ } if(subrange && type){ - type->size = size; - + type->element_count = size; + xbt_free(name); name = NULL; xbt_free(end); @@ -1213,13 +1235,16 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ }else { type = xbt_new0(s_dw_type_t, 1); - type->type = e_dw_array_type; + type->type = DW_TAG_array_type; type->name = xbt_strdup(name); type->is_pointer_type = is_pointer; type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) type->dw_type_id = xbt_strdup(type_origin); type->members = NULL; + + // Filled in a post processing step: + type-> byte_size = 0; xbt_dict_set(*types, origin, type, NULL); @@ -1258,9 +1283,29 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ xbt_dict_free(&location_list); pclose(fp); - return result; + + MC_post_process_types(info); +} + +static void MC_post_process_array_size(mc_object_info_t info, dw_type_t type) { + xbt_assert(type->dw_type_id, "No base type for array <%p>%s", type->id, type->name); + dw_type_t subtype = xbt_dict_get_or_null(info->types, type->dw_type_id); + xbt_assert(subtype, "Unkown base type <%s> for array <%p>%s", type->dw_type_id, type->id, type->name); + if(subtype->type==DW_TAG_array_type && type->byte_size==0) { + MC_post_process_array_size(info, subtype); + } + type->byte_size = type->element_count*subtype->byte_size; } +static void MC_post_process_types(mc_object_info_t info) { + xbt_dict_cursor_t cursor; + char *origin; + dw_type_t type; + xbt_dict_foreach(info->types, cursor, origin, type){ + if(type->type==DW_TAG_array_type && type->byte_size==0) + MC_post_process_array_size(info, type); + } +} /******************************* Ignore mechanism *******************************/ /*********************************************************************************/ @@ -1734,10 +1779,24 @@ static void MC_dump_ignored_global_variables(void){ } +static void MC_init_debug_info(); +static void MC_init_debug_info() { + XBT_INFO("Get debug information ..."); + + memory_map_t maps = MC_get_memory_map(); + + /* Get local variables for state equality detection */ + mc_binary_info = MC_find_object_info(maps, xbt_binary_name); + mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path); + + MC_free_memory_map(maps); + XBT_INFO("Get debug information done !"); +} + void MC_init(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - + compare = 0; /* Initialize the data structures that must be persistent across every @@ -1746,22 +1805,11 @@ void MC_init(){ MC_SET_RAW_MEM; MC_init_memory_map_info(); - - XBT_INFO("Get debug information ..."); - - /* Get local variables for state equality detection */ - mc_binary_info = MC_dwarf_get_variables(xbt_binary_name); - mc_libsimgrid_info = MC_dwarf_get_variables(libsimgrid_path); - - XBT_INFO("Get debug information done !"); + MC_init_debug_info(); /* Remove variables ignored before getting list of variables */ MC_dump_ignored_local_variables(); MC_dump_ignored_global_variables(); - - /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */ - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); /* Init parmap */ parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT); @@ -1896,8 +1944,7 @@ void MC_modelcheck_safety(void) }else{ MC_SET_RAW_MEM; MC_init_memory_map_info(); - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); + MC_init_debug_info(); MC_UNSET_RAW_MEM; }