X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf9200da17217300a7966654d881f2efdb8e514c..602438d4fc78f03a184aa70a05d46f239d25df8d:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 5ed07dad5c..ea39360d40 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" @@ -110,12 +111,6 @@ int compare; xbt_automaton_t _mc_property_automaton = NULL; /* Variables */ -xbt_dict_t mc_local_variables_libsimgrid = NULL; -xbt_dict_t mc_local_variables_binary = NULL; -xbt_dynar_t mc_global_variables_libsimgrid = NULL; -xbt_dynar_t mc_global_variables_binary = NULL; -xbt_dict_t mc_variables_type_libsimgrid = NULL; -xbt_dict_t mc_variables_type_binary = NULL; mc_object_info_t mc_libsimgrid_info = NULL; mc_object_info_t mc_binary_info = NULL; @@ -182,6 +177,14 @@ static void dw_variable_free_voidp(void *t){ mc_object_info_t MC_new_object_info() { 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); @@ -189,6 +192,7 @@ mc_object_info_t MC_new_object_info() { } void MC_free_object_info(mc_object_info_t* info) { + xbt_free(&(*info)->file_name); xbt_dict_free(&(*info)->local_variables); xbt_dynar_free(&(*info)->global_variables); xbt_dict_free(&(*info)->types); @@ -522,7 +526,9 @@ 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){ +static void MC_dwarf_get_variables(mc_object_info_t 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); @@ -533,7 +539,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(); xbt_dict_t *local_variables = &result->local_variables; xbt_dynar_t *global_variables = &result->global_variables; xbt_dict_t *types = &result->types; @@ -783,8 +788,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); @@ -796,8 +802,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; @@ -1260,7 +1267,6 @@ static mc_object_info_t MC_dwarf_get_variables(const char *elf_file){ xbt_dict_free(&location_list); pclose(fp); - return result; } @@ -1736,10 +1742,29 @@ 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_address(maps, xbt_binary_name); + MC_dwarf_get_variables(mc_binary_info); + + mc_libsimgrid_info = MC_find_object_address(maps, libsimgrid_path); + MC_dwarf_get_variables(mc_libsimgrid_info); + + 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 @@ -1748,29 +1773,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); - - mc_local_variables_libsimgrid = mc_libsimgrid_info->local_variables; - mc_local_variables_binary = mc_binary_info->local_variables; - mc_global_variables_libsimgrid = mc_libsimgrid_info->global_variables; - mc_global_variables_binary = mc_binary_info->global_variables; - mc_variables_type_libsimgrid = mc_libsimgrid_info->types; - mc_variables_type_binary = mc_binary_info->types; - - 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); @@ -1905,8 +1912,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(); MC_UNSET_RAW_MEM; }