X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5ee977c604c3348f24ef6f27e2ba160c87ae7b..71f886401650b3aa9f05d2eebec723af25fff9f0:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 47ab4acd9c..89b98559a9 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "simgrid/sg_config.h" @@ -138,6 +139,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,6 +156,14 @@ const char* colors[13]; /************************** Free functions *************************/ +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_dynar_free(&(frame->scopes)); + xbt_free(frame); +} + void dw_type_free(dw_type_t t){ xbt_free(t->name); xbt_free(t->dw_type_id); @@ -160,10 +172,6 @@ void dw_type_free(dw_type_t t){ 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); @@ -181,18 +189,20 @@ 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 = 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)->full_types_by_name); @@ -204,6 +214,8 @@ void MC_free_object_info(mc_object_info_t* info) { // ***** Helpers void* MC_object_base_address(mc_object_info_t info) { + if(info->flags & MC_OBJECT_INFO_EXECUTABLE) + return 0; void* result = info->start_exec; if(info->start_rw!=NULL && result > (void*) info->start_rw) result = info->start_rw; if(info->start_ro!=NULL && result > (void*) info->start_ro) result = info->start_ro; @@ -226,8 +238,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; @@ -249,12 +262,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; @@ -269,7 +280,7 @@ static dw_frame_t MC_find_function_by_ip_and_object(void* ip, mc_object_info_t i int k = i + ((j-i)/2); if(ip < base[k].low_pc) { j = k-1; - } else if(ip > base[k].high_pc) { + } else if(ip >= base[k].high_pc) { i = k+1; } else { return base[k].function; @@ -296,18 +307,42 @@ static void MC_post_process_variables(mc_object_info_t info) { } } -static void MC_post_process_functions(mc_object_info_t info) { +static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) { + + if(scope->tag == DW_TAG_inlined_subroutine) { + + // Attach correct namespaced name in inlined subroutine: + char* key = bprintf("%" PRIx64, (uint64_t) scope->abstract_origin_id); + dw_frame_t abstract_origin = xbt_dict_get_or_null(info->subprograms, key); + xbt_assert(abstract_origin, "Could not lookup abstract origin %s", key); + xbt_free(key); + scope->name = xbt_strdup(abstract_origin->name); + + } + + // Direct: unsigned cursor = 0; - dw_frame_t function = NULL; - xbt_dynar_foreach(info->subprograms, cursor, function) { - unsigned cursor2 = 0; - dw_variable_t variable = NULL; - xbt_dynar_foreach(function->variables, cursor2, variable) { - if(variable->type_origin) { - variable->type = xbt_dict_get_or_null(info->types, variable->type_origin); - } + dw_variable_t variable = NULL; + xbt_dynar_foreach(scope->variables, cursor, variable) { + if(variable->type_origin) { + variable->type = xbt_dict_get_or_null(info->types, variable->type_origin); } } + + // Recursive post-processing of nested-scopes: + dw_frame_t nested_scope = NULL; + xbt_dynar_foreach(scope->scopes, cursor, nested_scope) + mc_post_process_scope(info, nested_scope); + +} + +static void MC_post_process_functions(mc_object_info_t info) { + xbt_dict_cursor_t cursor; + char* key; + dw_frame_t subprogram = NULL; + xbt_dict_foreach(info->subprograms, cursor, key, subprogram) { + mc_post_process_scope(info, subprogram); + } } /** \brief Finds informations about a given shared object/executable */ @@ -327,41 +362,6 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executab /*************************************************************************/ -/** \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; - char *name; - dw_frame_t res; - - xbt_dict_foreach(all_variables, cursor, name, res) { - if(offset >= res->start && offset < res->end){ - xbt_dict_cursor_free(&cursor); - return res; - } - } - - xbt_dict_cursor_free(&cursor); - return NULL; - -} - -static dw_variable_t MC_dwarf_get_variable_by_name(dw_frame_t frame, char *var){ - - unsigned int cursor = 0; - dw_variable_t current_var; - - xbt_dynar_foreach(frame->variables, cursor, current_var){ - if(strcmp(var, current_var->name) == 0) - return current_var; - } - - return NULL; -} - static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *address){ if(xbt_dynar_is_empty(variables)) @@ -599,35 +599,69 @@ void MC_ignore_global_variable(const char *name){ MC_UNSET_RAW_MEM; } -static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) { - unsigned cursor2; - dw_frame_t frame; - int start, end; - int cursor = 0; - dw_variable_t current_var; +/** \brief Ignore a local variable in a scope + * + * Ignore all instances of variables with a given name in + * any (possibly inlined) subprogram with a given namespaced + * name. + * + * \param var_name Name of the local variable (or parameter to ignore) + * \param subprogram_name Name of the subprogram fo ignore (NULL for any) + * \param subprogram (possibly inlined) Subprogram of the scope + * \param scope Current scope + */ +static void mc_ignore_local_variable_in_scope( + const char *var_name, const char *subprogram_name, + dw_frame_t subprogram, dw_frame_t scope) { + // Processing of direct variables: - xbt_dynar_foreach(info->subprograms, cursor2, frame) { + // If the current subprogram matche the given name: + if(subprogram_name==NULL || strcmp(subprogram_name, subprogram->name)==0) { - if(frame_name && strcmp(frame_name, frame->name)) - continue; + // Try to find the variable and remove it: + int start = 0; + int end = xbt_dynar_length(scope->variables) - 1; - start = 0; - end = xbt_dynar_length(frame->variables) - 1; + // Dichotomic search: while(start <= end){ - cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); + int cursor = (start + end) / 2; + dw_variable_t current_var = (dw_variable_t)xbt_dynar_get_as(scope->variables, cursor, dw_variable_t); int compare = strcmp(current_var->name, var_name); if(compare == 0){ - xbt_dynar_remove_at(frame->variables, cursor, NULL); + // Variable found, remove it: + xbt_dynar_remove_at(scope->variables, cursor, NULL); + + // and start again: start = 0; - end = xbt_dynar_length(frame->variables) - 1; + end = xbt_dynar_length(scope->variables) - 1; }else if(compare < 0){ start = cursor + 1; }else{ end = cursor - 1; } } + + } + + // And recursive processing in nested scopes: + unsigned cursor = 0; + dw_frame_t nested_scope = NULL; + xbt_dynar_foreach(scope->scopes, cursor, nested_scope) { + // The new scope may be an inlined subroutine, in this case we want to use its + // namespaced name in recursive calls: + dw_frame_t nested_subprogram = nested_scope->tag == DW_TAG_inlined_subroutine ? nested_scope : subprogram; + + mc_ignore_local_variable_in_scope(var_name, subprogram_name, nested_subprogram, nested_scope); + } +} + +static void MC_ignore_local_variable_in_object(const char *var_name, const char *subprogram_name, mc_object_info_t info) { + xbt_dict_cursor_t cursor2; + dw_frame_t frame; + char* key; + xbt_dict_foreach(info->subprograms, cursor2, key, frame) { + mc_ignore_local_variable_in_scope(var_name, subprogram_name, frame, frame); } } @@ -735,14 +769,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->full_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; + } + } } + } } @@ -753,7 +795,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); @@ -1070,17 +1115,24 @@ void MC_replay(xbt_fifo_t stack, int start) } MC_SET_RAW_MEM; - xbt_dict_reset(first_enabled_state); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ + + if(mc_reduce_kind == e_mc_reduce_dpor){ + xbt_dict_reset(first_enabled_state); + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ char *key = bprintf("%lu", process->pid); char *data = bprintf("%d", count); xbt_dict_set(first_enabled_state, key, data, NULL); xbt_free(key); + } } } - if(_sg_mc_comms_determinism || _sg_mc_send_determinism) + + if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ xbt_dynar_reset(communications_pattern); + xbt_dynar_reset(incomplete_communications_pattern); + } + MC_UNSET_RAW_MEM; @@ -1092,11 +1144,13 @@ void MC_replay(xbt_fifo_t stack, int start) state = (mc_state_t) xbt_fifo_get_item_content(item); saved_req = MC_state_get_executed_request(state, &value); - MC_SET_RAW_MEM; - char *key = bprintf("%lu", saved_req->issuer->pid); - xbt_dict_remove(first_enabled_state, key); - xbt_free(key); - MC_UNSET_RAW_MEM; + if(mc_reduce_kind == e_mc_reduce_dpor){ + MC_SET_RAW_MEM; + char *key = bprintf("%lu", saved_req->issuer->pid); + xbt_dict_remove(first_enabled_state, key); + xbt_free(key); + MC_UNSET_RAW_MEM; + } if(saved_req){ /* because we got a copy of the executed request, we have to fetch the @@ -1115,7 +1169,7 @@ void MC_replay(xbt_fifo_t stack, int start) if(req->call == SIMCALL_COMM_ISEND) comm_pattern = 1; else if(req->call == SIMCALL_COMM_IRECV) - comm_pattern = 2; + comm_pattern = 2; } SIMIX_simcall_pre(req, value); @@ -1133,19 +1187,21 @@ void MC_replay(xbt_fifo_t stack, int start) count++; - MC_SET_RAW_MEM; - /* Insert in dict all enabled processes */ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process) /*&& !MC_state_process_is_done(state, process)*/){ - char *key = bprintf("%lu", process->pid); - if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){ - char *data = bprintf("%d", count); - xbt_dict_set(first_enabled_state, key, data, NULL); + if(mc_reduce_kind == e_mc_reduce_dpor){ + MC_SET_RAW_MEM; + /* Insert in dict all enabled processes */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process) /*&& !MC_state_process_is_done(state, process)*/){ + char *key = bprintf("%lu", process->pid); + if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){ + char *data = bprintf("%d", count); + xbt_dict_set(first_enabled_state, key, data, NULL); + } + xbt_free(key); } - xbt_free(key); } + MC_UNSET_RAW_MEM; } - MC_UNSET_RAW_MEM; /* Update statistics */ mc_stats->visited_states++;