X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea6f6b66934613235f03c2a768cb84cba48db423..cf9200da17217300a7966654d881f2efdb8e514c:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 4ae023d8dd..5ed07dad5c 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -116,6 +116,8 @@ 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; /* Ignore mechanism */ xbt_dynar_t mc_stack_comparison_ignore; @@ -176,6 +178,24 @@ static void dw_variable_free_voidp(void *t){ dw_variable_free((dw_variable_t) * (void **) t); } +// object_info + +mc_object_info_t MC_new_object_info() { + mc_object_info_t res = xbt_new(s_mc_object_info_t, 1); + 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); + return res; +} + +void MC_free_object_info(mc_object_info_t* info) { + xbt_dict_free(&(*info)->local_variables); + xbt_dynar_free(&(*info)->global_variables); + xbt_dict_free(&(*info)->types); + xbt_free(info); + info = NULL; +} + /*************************************************************************/ static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr){ @@ -314,9 +334,14 @@ static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr) } +/** @brief Extract the location lists from an ELF file (.debug_loc) + * + * @return A map from the offset in the list (in hexadecimal string) + * into a location list (dynar of dw_location_entry_t). + */ static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ - char *command = bprintf("objdump -Wo %s", elf_file); + char *command = bprintf("LANG=C objdump -Wo %s", elf_file); FILE *fp = popen(command, "r"); @@ -371,8 +396,14 @@ static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ xbt_str_strip_spaces(line); split = xbt_str_split(line, " "); + char *key = NULL; while(read != -1 && strcmp("lowpc = strtoul((char *)xbt_dynar_get_as(split, 1, char *), NULL, 16); new_entry->highpc = strtoul((char *)xbt_dynar_get_as(split, 2, char *), NULL, 16); @@ -403,7 +434,6 @@ static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ } - char *key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16)); xbt_dict_set(location_list, key, loclist, NULL); xbt_free(key); @@ -492,16 +522,22 @@ 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(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *local_variables, xbt_dynar_t *global_variables, xbt_dict_t *types){ + xbt_dict_t location_list = MC_dwarf_get_location_list(elf_file); - char *command = bprintf("objdump -Wi %s", elf_file); + char *command = bprintf("LANG=C objdump -Wi %s", elf_file); FILE *fp = popen(command, "r"); 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; + char *line = NULL, *origin, *abstract_origin, *current_frame = NULL, *subprogram_name = NULL, *subprogram_start = NULL, *subprogram_end = NULL, *node_type = NULL, *location_type = NULL, *variable_name = NULL, @@ -550,6 +586,8 @@ static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_lis node_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); if(strcmp(node_type, "(DW_TAG_subprogram)") == 0){ /* New frame */ + /* We build/complete a dw_frame_t object + * and append it if necessary to the local_variables dictionnary */ dw_frame_t frame = NULL; @@ -665,6 +703,9 @@ static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_lis }else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */ + /* We build a dw_variable_t object and append it either to + the list of variables of the frame (local variable) + or to the list of global variables (global variables). */ dw_variable_t var = NULL; @@ -817,6 +858,7 @@ static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_lis new_variable = 1; }else if(strcmp(node_type, "(DW_TAG_inlined_subroutine)") == 0){ + /* Update the information on the frame (we should duplicate it instead). */ read = xbt_getline(&line, &n, fp); @@ -871,6 +913,8 @@ static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_lis || strcmp(node_type, "(DW_TAG_volatile_type)") == 0 || (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; else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0) @@ -1213,8 +1257,10 @@ static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_lis xbt_dict_free(&subprograms_origin); xbt_free(line); xbt_free(command); + xbt_dict_free(&location_list); + pclose(fp); - + return result; } @@ -1375,20 +1421,20 @@ void MC_ignore_global_variable(const char *name){ MC_SET_RAW_MEM; - if(mc_global_variables_libsimgrid){ + if(mc_libsimgrid_info){ unsigned int cursor = 0; dw_variable_t current_var; int start = 0; - int end = xbt_dynar_length(mc_global_variables_libsimgrid) - 1; + int end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; while(start <= end){ cursor = (start + end) /2; - current_var = (dw_variable_t)xbt_dynar_get_as(mc_global_variables_libsimgrid, cursor, dw_variable_t); + current_var = (dw_variable_t)xbt_dynar_get_as(mc_libsimgrid_info->global_variables, cursor, dw_variable_t); if(strcmp(current_var->name, name) == 0){ - xbt_dynar_remove_at(mc_global_variables_libsimgrid, cursor, NULL); + xbt_dynar_remove_at(mc_libsimgrid_info->global_variables, cursor, NULL); start = 0; - end = xbt_dynar_length(mc_global_variables_libsimgrid) - 1; + end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; }else if(strcmp(current_var->name, name) < 0){ start = cursor + 1; }else{ @@ -1449,7 +1495,7 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name){ MC_SET_RAW_MEM; - if(mc_local_variables_libsimgrid){ + if(mc_libsimgrid_info){ unsigned int cursor = 0; dw_variable_t current_var; int start, end; @@ -1457,7 +1503,7 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name){ xbt_dict_cursor_t dict_cursor; char *current_frame_name; dw_frame_t frame; - xbt_dict_foreach(mc_local_variables_libsimgrid, dict_cursor, current_frame_name, frame){ + xbt_dict_foreach(mc_libsimgrid_info->local_variables, dict_cursor, current_frame_name, frame){ start = 0; end = xbt_dynar_length(frame->variables) - 1; while(start <= end){ @@ -1474,7 +1520,7 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name){ } } } - xbt_dict_foreach(mc_local_variables_binary, dict_cursor, current_frame_name, frame){ + xbt_dict_foreach(mc_binary_info->local_variables, dict_cursor, current_frame_name, frame){ start = 0; end = xbt_dynar_length(frame->variables) - 1; while(start <= end){ @@ -1492,7 +1538,8 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name){ } } }else{ - xbt_dynar_t variables_list = ((dw_frame_t)xbt_dict_get_or_null(mc_local_variables_libsimgrid, frame_name))->variables; + xbt_dynar_t variables_list = ((dw_frame_t)xbt_dict_get_or_null( + mc_libsimgrid_info->local_variables, frame_name))->variables; start = 0; end = xbt_dynar_length(variables_list) - 1; while(start <= end){ @@ -1701,26 +1748,19 @@ void MC_init(){ MC_SET_RAW_MEM; MC_init_memory_map_info(); - - mc_local_variables_libsimgrid = xbt_dict_new_homogeneous(NULL); - mc_local_variables_binary = xbt_dict_new_homogeneous(NULL); - mc_global_variables_libsimgrid = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - mc_global_variables_binary = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - mc_variables_type_libsimgrid = xbt_dict_new_homogeneous(NULL); - mc_variables_type_binary = xbt_dict_new_homogeneous(NULL); XBT_INFO("Get debug information ..."); - /* Get local variables in binary for state equality detection */ - xbt_dict_t binary_location_list = MC_dwarf_get_location_list(xbt_binary_name); - MC_dwarf_get_variables(xbt_binary_name, binary_location_list, &mc_local_variables_binary, &mc_global_variables_binary, &mc_variables_type_binary); - - /* Get local variables in libsimgrid for state equality detection */ - xbt_dict_t libsimgrid_location_list = MC_dwarf_get_location_list(libsimgrid_path); - MC_dwarf_get_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables_libsimgrid, &mc_global_variables_libsimgrid, &mc_variables_type_libsimgrid); + /* 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_dict_free(&libsimgrid_location_list); - xbt_dict_free(&binary_location_list); + 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 !");