X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28c5e894dc6ed5d5d45a834aa9fef5cfe6f15fa7..f9e6853d2c5b7b867211700bc12f0ee57f640b30:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index b02b11cac6..0457aa97c7 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2013. The SimGrid Team. +/* Copyright (c) 2008-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -30,9 +30,12 @@ int _sg_do_model_check = 0; int _sg_mc_checkpoint=0; char* _sg_mc_property_file=NULL; int _sg_mc_timeout=0; +int _sg_mc_hash=0; int _sg_mc_max_depth=1000; int _sg_mc_visited=0; char *_sg_mc_dot_output_file = NULL; +int _sg_mc_comms_determinism=0; +int _sg_mc_send_determinism=0; int user_max_depth_reached = 0; @@ -70,6 +73,13 @@ void _mc_cfg_cb_timeout(const char *name, int pos) { _sg_mc_timeout= xbt_cfg_get_boolean(_sg_cfg_set, name); } +void _mc_cfg_cb_hash(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_hash= xbt_cfg_get_boolean(_sg_cfg_set, name); +} + void _mc_cfg_cb_max_depth(const char *name, int pos) { if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); @@ -91,6 +101,20 @@ void _mc_cfg_cb_dot_output(const char *name, int pos) { _sg_mc_dot_output_file= xbt_cfg_get_string(_sg_cfg_set, name); } +void _mc_cfg_cb_comms_determinism(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a value to enable/disable the detection of determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_comms_determinism= xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +void _mc_cfg_cb_send_determinism(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a value to enable/disable the detection of send-determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_send_determinism= xbt_cfg_get_boolean(_sg_cfg_set, name); +} + /* MC global data structures */ mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; @@ -114,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; @@ -128,41 +155,29 @@ 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_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); 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->address.location); + + if(v->locations.locations) + mc_dwarf_location_list_clear(&v->locations); xbt_free(v); } } @@ -171,201 +186,181 @@ void dw_variable_free_voidp(void *t){ dw_variable_free((dw_variable_t) * (void **) t); } -// object_info +// ***** 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->local_variables = xbt_dict_new_homogeneous(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_dict_free(&(*info)->local_variables); + 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; } -/*************************************************************************/ - -static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr){ +// ***** Helpers - dw_location_t loc = xbt_new0(s_dw_location_t, 1); - - if(location_list != NULL){ - - char *key = bprintf("%d", (int)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; +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; + return result; +} - }else{ +// ***** Functions index - int cursor = 0; - char *tok = NULL, *tok2 = NULL; - - xbt_dynar_t tokens1 = xbt_str_split(expr, ";"); - xbt_dynar_t tokens2; +static int MC_compare_frame_index_items(mc_function_index_item_t a, mc_function_index_item_t b) { + if(a->low_pc < b->low_pc) + return -1; + else if(a->low_pc == b->low_pc) + return 0; + else + return 1; +} - loc->type = e_dw_compose; - loc->location.compose = xbt_dynar_new(sizeof(dw_location_t), NULL); +static void MC_make_functions_index(mc_object_info_t info) { + xbt_dynar_t index = xbt_dynar_new(sizeof(s_mc_function_index_item_t), NULL); + + // Populate the array: + dw_frame_t frame = NULL; + 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; + entry.low_pc = frame->low_pc; + entry.high_pc = frame->high_pc; + entry.function = frame; + xbt_dynar_push(index, &entry); + } - while(cursor < xbt_dynar_length(tokens1)){ + mc_function_index_item_t base = (mc_function_index_item_t) xbt_dynar_get_ptr(index, 0); - 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); - } + // Sort the array by low_pc: + qsort(base, + xbt_dynar_length(index), + sizeof(s_mc_function_index_item_t), + (int (*)(const void *, const void *))MC_compare_frame_index_items); - cursor++; - xbt_dynar_free(&tokens2); + info->functions_index = index; +} +mc_object_info_t MC_ip_find_object_info(void* ip) { + size_t 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]; } - - xbt_dynar_free(&tokens1); + } + return NULL; +} - return loc; - +static dw_frame_t MC_find_function_by_ip_and_object(void* ip, mc_object_info_t info) { + xbt_dynar_t dynar = info->functions_index; + mc_function_index_item_t base = (mc_function_index_item_t) xbt_dynar_get_ptr(dynar, 0); + int i = 0; + int j = xbt_dynar_length(dynar) - 1; + while(j>=i) { + int k = i + ((j-i)/2); + if(ip < base[k].low_pc) { + j = k-1; + } else if(ip >= base[k].high_pc) { + i = k+1; + } else { + return base[k].function; + } } + return NULL; +} +dw_frame_t MC_find_function_by_ip(void* ip) { + mc_object_info_t info = MC_ip_find_object_info(ip); + if(info==NULL) + return NULL; + else + return MC_find_function_by_ip_and_object(ip, info); } +static void MC_post_process_variables(mc_object_info_t info) { + unsigned cursor = 0; + dw_variable_t variable = NULL; + xbt_dynar_foreach(info->global_variables, cursor, variable) { + if(variable->type_origin) { + variable->type = xbt_dict_get_or_null(info->types, variable->type_origin); + } + } +} -/** \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){ +static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) { - xbt_dict_cursor_t cursor = NULL; - char *name; - dw_frame_t res; + 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); - 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; - -} + // Direct: + unsigned cursor = 0; + 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); + } + } -static dw_variable_t MC_dwarf_get_variable_by_name(dw_frame_t frame, char *var){ + // 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); - 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; +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); } +} - return NULL; +/** \brief Finds informations about a given shared object/executable */ +mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executable) { + mc_object_info_t result = MC_new_object_info(); + if(executable) + result->flags |= MC_OBJECT_INFO_EXECUTABLE; + result->file_name = xbt_strdup(name); + MC_find_object_address(maps, result); + MC_dwarf_get_variables(result); + MC_post_process_types(result); + MC_post_process_variables(result); + MC_post_process_functions(result); + MC_make_functions_index(result); + return result; } +/*************************************************************************/ + static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *address){ if(xbt_dynar_is_empty(variables)) @@ -385,9 +380,9 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a end = cursor - 1; }else{ if(address){ /* global variable */ - if(var_test->address.address == address) + if(var_test->address == address) return -1; - if(var_test->address.address > address) + if(var_test->address > address) end = cursor - 1; else start = cursor + 1; @@ -398,7 +393,7 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } if(strcmp(var_test->name, var) == 0){ - if(address && var_test->address.address < address) + if(address && var_test->address < address) return cursor+1; else return cursor; @@ -410,7 +405,7 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } void MC_dwarf_register_global_variable(mc_object_info_t info, dw_variable_t variable) { - int index = MC_dwarf_get_variable_index(info->global_variables, variable->name, variable->address.address); + int index = MC_dwarf_get_variable_index(info->global_variables, variable->name, variable->address); if (index != -1) xbt_dynar_insert_at(info->global_variables, index, &variable); // TODO, else ? @@ -603,72 +598,84 @@ void MC_ignore_global_variable(const char *name){ MC_UNSET_RAW_MEM; } +/** \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: + + // If the current subprogram matche the given name: + if(subprogram_name==NULL || strcmp(subprogram_name, subprogram->name)==0) { + + // Try to find the variable and remove it: + int start = 0; + int end = xbt_dynar_length(scope->variables) - 1; + + // Dichotomic search: + while(start <= end){ + 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){ + // Variable found, remove it: + xbt_dynar_remove_at(scope->variables, cursor, NULL); + + // and start again: + start = 0; + 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); + } +} + void MC_ignore_local_variable(const char *var_name, const char *frame_name){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + if(strcmp(frame_name, "*") == 0) + frame_name = NULL; + MC_SET_RAW_MEM; - unsigned int cursor = 0; - dw_variable_t current_var; - int start, end; - if(strcmp(frame_name, "*") == 0){ /* Remove variable in all frames */ - xbt_dict_cursor_t dict_cursor; - char *current_frame_name; - dw_frame_t 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){ - cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); - if(strcmp(current_var->name, var_name) == 0){ - xbt_dynar_remove_at(frame->variables, cursor, NULL); - start = 0; - end = xbt_dynar_length(frame->variables) - 1; - }else if(strcmp(current_var->name, var_name) < 0){ - start = cursor + 1; - }else{ - end = cursor - 1; - } - } - } - 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){ - cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); - if(strcmp(current_var->name, var_name) == 0){ - xbt_dynar_remove_at(frame->variables, cursor, NULL); - start = 0; - end = xbt_dynar_length(frame->variables) - 1; - }else if(strcmp(current_var->name, var_name) < 0){ - start = cursor + 1; - }else{ - end = cursor - 1; - } - } - } - }else{ - 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){ - cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(variables_list, cursor, dw_variable_t); - if(strcmp(current_var->name, var_name) == 0){ - xbt_dynar_remove_at(variables_list, cursor, NULL); - start = 0; - end = xbt_dynar_length(variables_list) - 1; - }else if(strcmp(current_var->name, var_name) < 0){ - start = cursor + 1; - }else{ - end = cursor - 1; - } - } - } + MC_ignore_local_variable_in_object(var_name, frame_name, mc_libsimgrid_info); + if(frame_name!=NULL) + MC_ignore_local_variable_in_object(var_name, frame_name, mc_binary_info); if(!raw_mem_set) MC_UNSET_RAW_MEM; @@ -760,15 +767,41 @@ void MC_ignore(void *addr, size_t size){ /******************************* Initialisation of MC *******************************/ /*********************************************************************************/ -static void MC_init_debug_info(); -static void MC_init_debug_info() { +static void MC_post_process_object_info(mc_object_info_t 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) { + 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; + } + } + } + + } +} + +static void MC_init_debug_info(void) { 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_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); + MC_post_process_object_info(mc_libsimgrid_info); MC_free_memory_map(maps); XBT_INFO("Get debug information done !"); @@ -803,12 +836,14 @@ void MC_init(){ MC_ignore_local_variable("_throw_ctx", "*"); MC_ignore_local_variable("ctx", "*"); + MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); MC_ignore_local_variable("next_context", "smx_ctx_sysv_suspend_serial"); MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial"); /* Ignore local variable about time used for tracing */ MC_ignore_local_variable("start_time", "*"); + MC_ignore_global_variable("compared_pointers"); MC_ignore_global_variable("mc_comp_times"); MC_ignore_global_variable("mc_snapshot_comparison_time"); MC_ignore_global_variable("mc_time"); @@ -1088,7 +1123,8 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_free(key); } } - xbt_dynar_reset(communications_pattern); + if(_sg_mc_comms_determinism || _sg_mc_send_determinism) + xbt_dynar_reset(communications_pattern); MC_UNSET_RAW_MEM; @@ -1119,20 +1155,23 @@ 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) + if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ + if(req->call == SIMCALL_COMM_ISEND) + comm_pattern = 1; + else if(req->call == SIMCALL_COMM_IRECV) comm_pattern = 2; - + } + SIMIX_simcall_pre(req, value); - MC_SET_RAW_MEM; - if(comm_pattern != 0){ - get_comm_pattern(communications_pattern, req, comm_pattern); + if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ + MC_SET_RAW_MEM; + if(comm_pattern != 0){ + get_comm_pattern(communications_pattern, req, comm_pattern); + } + MC_UNSET_RAW_MEM; + comm_pattern = 0; } - MC_UNSET_RAW_MEM; - - comm_pattern = 0; MC_wait_for_requests(); @@ -1415,8 +1454,10 @@ void MC_print_statistics(mc_stats_t stats) fclose(dot_output); } if(initial_state_safety != NULL){ - // XBT_INFO("Communication-deterministic : %s", !initial_state_safety->comm_deterministic ? "No" : "Yes"); - // XBT_INFO("Send-deterministic : %s", !initial_state_safety->send_deterministic ? "No" : "Yes"); + if(_sg_mc_comms_determinism) + XBT_INFO("Communication-deterministic : %s", !initial_state_safety->comm_deterministic ? "No" : "Yes"); + if (_sg_mc_send_determinism) + XBT_INFO("Send-deterministic : %s", !initial_state_safety->send_deterministic ? "No" : "Yes"); } MC_UNSET_RAW_MEM; }