X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..0b83205608b7fc3e935b970509a08e381ad1dffe:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 133343e8ee..0c6c04d46e 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -138,6 +138,9 @@ xbt_automaton_t _mc_property_automaton = NULL; mc_object_info_t mc_libsimgrid_info = NULL; mc_object_info_t mc_binary_info = NULL; +mc_object_info_t mc_object_infos[2] = { NULL, NULL }; +size_t mc_object_infos_size = 2; + /* Ignore mechanism */ extern xbt_dynar_t mc_heap_comparison_ignore; extern xbt_dynar_t stacks_areas; @@ -152,41 +155,28 @@ const char* colors[13]; /************************** Free functions *************************/ -static void dw_location_free(dw_location_t l){ - if(l){ - if(l->type == e_dw_loclist) - xbt_dynar_free(&(l->location.loclist)); - else if(l->type == e_dw_compose) - xbt_dynar_free(&(l->location.compose)); - else if(l->type == e_dw_arithmetic) - xbt_free(l->location.arithmetic); - - xbt_free(l); - } -} - -static void dw_location_entry_free(dw_location_entry_t e){ - dw_location_free(e->location); - xbt_free(e); +void mc_frame_free(dw_frame_t frame){ + xbt_free(frame->name); + mc_dwarf_location_list_clear(&(frame->frame_base)); + xbt_dynar_free(&(frame->variables)); + xbt_free(frame); } void dw_type_free(dw_type_t t){ xbt_free(t->name); xbt_free(t->dw_type_id); xbt_dynar_free(&(t->members)); + mc_dwarf_expression_clear(&t->location); xbt_free(t); } -static void dw_type_free_voidp(void *t){ - dw_type_free((dw_type_t) * (void **) t); -} - void dw_variable_free(dw_variable_t v){ if(v){ xbt_free(v->name); xbt_free(v->type_origin); - if(!v->global) - dw_location_free(v->location); + + if(v->locations.locations) + mc_dwarf_location_list_clear(&v->locations); xbt_free(v); } } @@ -197,21 +187,23 @@ void dw_variable_free_voidp(void *t){ // ***** object_info + + mc_object_info_t MC_new_object_info(void) { mc_object_info_t res = xbt_new0(s_mc_object_info_t, 1); - res->subprograms = xbt_dynar_new(sizeof(dw_frame_t), NULL); + res->subprograms = xbt_dict_new_homogeneous((void (*)(void*))mc_frame_free); res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - res->types = xbt_dict_new_homogeneous(NULL); - res->types_by_name = xbt_dict_new_homogeneous(NULL); + res->types = xbt_dict_new_homogeneous((void (*)(void*))dw_type_free); + res->full_types_by_name = xbt_dict_new_homogeneous(NULL); return res; } void MC_free_object_info(mc_object_info_t* info) { xbt_free(&(*info)->file_name); - xbt_dynar_free(&(*info)->subprograms); + xbt_dict_free(&(*info)->subprograms); xbt_dynar_free(&(*info)->global_variables); xbt_dict_free(&(*info)->types); - xbt_dict_free(&(*info)->types_by_name); + xbt_dict_free(&(*info)->full_types_by_name); xbt_free(info); xbt_dynar_free(&(*info)->functions_index); *info = NULL; @@ -242,8 +234,9 @@ static void MC_make_functions_index(mc_object_info_t info) { // Populate the array: dw_frame_t frame = NULL; - unsigned cursor = 0; - xbt_dynar_foreach(info->subprograms, cursor, frame) { + xbt_dict_cursor_t cursor; + char* key; + xbt_dict_foreach(info->subprograms, cursor, key, frame) { if(frame->low_pc==NULL) continue; s_mc_function_index_item_t entry; @@ -265,12 +258,10 @@ static void MC_make_functions_index(mc_object_info_t info) { } mc_object_info_t MC_ip_find_object_info(void* ip) { - mc_object_info_t infos[2] = { mc_binary_info, mc_libsimgrid_info }; - size_t n = 2; size_t i; - for(i=0; i!=n; ++i) { - if(ip >= (void*)infos[i]->start_exec && ip <= (void*)infos[i]->end_exec) { - return infos[i]; + for(i=0; i!=mc_object_infos_size; ++i) { + if(ip >= (void*)mc_object_infos[i]->start_exec && ip <= (void*)mc_object_infos[i]->end_exec) { + return mc_object_infos[i]; } } return NULL; @@ -313,9 +304,10 @@ static void MC_post_process_variables(mc_object_info_t info) { } static void MC_post_process_functions(mc_object_info_t info) { - unsigned cursor = 0; + xbt_dict_cursor_t cursor; + char* key; dw_frame_t function = NULL; - xbt_dynar_foreach(info->subprograms, cursor, function) { + xbt_dict_foreach(info->subprograms, cursor, key, function) { unsigned cursor2 = 0; dw_variable_t variable = NULL; xbt_dynar_foreach(function->variables, cursor2, variable) { @@ -343,142 +335,6 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executab /*************************************************************************/ -static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr){ - - dw_location_t loc = xbt_new0(s_dw_location_t, 1); - - if(location_list != NULL){ - - char *key = bprintf("%lu", strtoul(expr, NULL, 16)); - loc->type = e_dw_loclist; - loc->location.loclist = (xbt_dynar_t)xbt_dict_get_or_null(location_list, key); - if(loc->location.loclist == NULL) - XBT_INFO("Key not found in loclist"); - xbt_free(key); - return loc; - - }else{ - - int cursor = 0; - char *tok = NULL, *tok2 = NULL; - - xbt_dynar_t tokens1 = xbt_str_split(expr, ";"); - xbt_dynar_t tokens2; - - loc->type = e_dw_compose; - loc->location.compose = xbt_dynar_new(sizeof(dw_location_t), NULL); - - while(cursor < xbt_dynar_length(tokens1)){ - - tok = xbt_dynar_get_as(tokens1, cursor, char*); - tokens2 = xbt_str_split(tok, " "); - tok2 = xbt_dynar_get_as(tokens2, 0, char*); - - if(strncmp(tok2, "DW_OP_reg", 9) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_register; - new_element->location.reg = atoi(strtok(tok2, "DW_OP_reg")); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_fbreg:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_fbregister_op; - new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strncmp(tok2, "DW_OP_breg", 10) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_bregister_op; - new_element->location.breg_op.reg = atoi(strtok(tok2, "DW_OP_breg")); - new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strncmp(tok2, "DW_OP_lit", 9) == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_lit; - new_element->location.lit = atoi(strtok(tok2, "DW_OP_lit")); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_piece:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_piece; - new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_plus_uconst:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_plus_uconst; - new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char *)); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_abs") == 0 || - strcmp(tok, "DW_OP_and") == 0 || - strcmp(tok, "DW_OP_div") == 0 || - strcmp(tok, "DW_OP_minus") == 0 || - strcmp(tok, "DW_OP_mod") == 0 || - strcmp(tok, "DW_OP_mul") == 0 || - strcmp(tok, "DW_OP_neg") == 0 || - strcmp(tok, "DW_OP_not") == 0 || - strcmp(tok, "DW_OP_or") == 0 || - strcmp(tok, "DW_OP_plus") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_arithmetic; - new_element->location.arithmetic = strdup(strtok(tok2, "DW_OP_")); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_stack_value") == 0){ - }else if(strcmp(tok2, "DW_OP_deref_size:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_deref; - new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_deref") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_deref; - new_element->location.deref_size = sizeof(void *); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_constu:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_uconstant; - new_element->location.uconstant.bytes = 1; - new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_consts:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_sconstant; - new_element->location.sconstant.bytes = 1; - new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok2, "DW_OP_const1u:") == 0 || - strcmp(tok2, "DW_OP_const2u:") == 0 || - strcmp(tok2, "DW_OP_const4u:") == 0 || - strcmp(tok2, "DW_OP_const8u:") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_uconstant; - new_element->location.uconstant.bytes = tok2[11] - '0'; - new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); - xbt_dynar_push(loc->location.compose, &new_element); - }else if(strcmp(tok, "DW_OP_const1s") == 0 || - strcmp(tok, "DW_OP_const2s") == 0 || - strcmp(tok, "DW_OP_const4s") == 0 || - strcmp(tok, "DW_OP_const8s") == 0){ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_sconstant; - new_element->location.sconstant.bytes = tok2[11] - '0'; - new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); - xbt_dynar_push(loc->location.compose, &new_element); - }else{ - dw_location_t new_element = xbt_new0(s_dw_location_t, 1); - new_element->type = e_dw_unsupported; - xbt_dynar_push(loc->location.compose, &new_element); - } - - cursor++; - xbt_dynar_free(&tokens2); - - } - - xbt_dynar_free(&tokens1); - - return loc; - - } - -} - /** \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. @@ -752,13 +608,13 @@ void MC_ignore_global_variable(const char *name){ } static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) { - unsigned cursor2; + xbt_dict_cursor_t cursor2; dw_frame_t frame; int start, end; int cursor = 0; dw_variable_t current_var; - - xbt_dynar_foreach(info->subprograms, cursor2, frame) { + char* key; + xbt_dict_foreach(info->subprograms, cursor2, key, frame) { if(frame_name && strcmp(frame_name, frame->name)) continue; @@ -887,14 +743,22 @@ void MC_ignore(void *addr, size_t size){ /*********************************************************************************/ static void MC_post_process_object_info(mc_object_info_t info) { - mc_object_info_t other_info = info == mc_binary_info ? mc_libsimgrid_info : mc_binary_info; xbt_dict_cursor_t cursor = NULL; char* key = NULL; dw_type_t type = NULL; xbt_dict_foreach(info->types, cursor, key, type){ + + // Resolve full_type: if(type->name && type->byte_size == 0) { - type->other_object_same_type = xbt_dict_get_or_null(other_info->types_by_name, type->name); + for(size_t i=0; i!=mc_object_infos_size; ++i) { + dw_type_t same_type = xbt_dict_get_or_null(mc_object_infos[i]->full_types_by_name, type->name); + if(same_type && same_type->name && same_type->byte_size) { + type->full_type = same_type; + break; + } + } } + } } @@ -905,7 +769,10 @@ static void MC_init_debug_info(void) { /* Get local variables for state equality detection */ mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1); + mc_object_infos[0] = mc_binary_info; + mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0); + mc_object_infos[1] = mc_libsimgrid_info; // Use information of the other objects: MC_post_process_object_info(mc_binary_info);