X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf9200da17217300a7966654d881f2efdb8e514c..8fc11b8e2c3f486babc8be5494ddd53ffcc659f4:/src/mc/mc_compare.c diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 41cc772f08..8d71ad4449 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -131,52 +131,51 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x void *addr_pointed1, *addr_pointed2; switch(type->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_union_type: - return (memcmp(area1, area2, type->size) != 0); + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_union_type: + return (memcmp(area1, area2, type->byte_size) != 0); break; - case e_dw_typedef: - case e_dw_volatile_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: + case DW_TAG_const_type: return compare_areas_with_type(area1, area2, types, other_types, type->dw_type_id, region_size, region_type, start_data, pointer_level); break; - case e_dw_const_type: /* Const variable cannot be modified */ - return -1; - break; - case e_dw_array_type: + case DW_TAG_array_type: subtype = xbt_dict_get_or_null(types, type->dw_type_id); switch(subtype->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_pointer_type: - case e_dw_structure_type: - case e_dw_union_type: - if(subtype->size == 0){ /*declaration of the type, need the complete description */ + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_structure_type: + case DW_TAG_union_type: + if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ subtype = xbt_dict_get_or_null(types, get_type_description(types, subtype->name)); if(subtype == NULL){ subtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subtype->name)); switch_types = 1; } } - elm_size = subtype->size; + elm_size = subtype->byte_size; break; - case e_dw_typedef: - case e_dw_volatile_type: + case DW_TAG_const_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: subsubtype = xbt_dict_get_or_null(types, subtype->dw_type_id); - if(subsubtype->size == 0){ /*declaration of the type, need the complete description */ + if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ subsubtype = xbt_dict_get_or_null(types, get_type_description(types, subsubtype->name)); if(subsubtype == NULL){ subsubtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subsubtype->name)); switch_types = 1; } } - elm_size = subsubtype->size; + elm_size = subsubtype->byte_size; break; default : return 0; break; } - for(i=0; isize; i++){ + for(i=0; ielement_count; i++){ if(switch_types) res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), other_types, types, type->dw_type_id, region_size, region_type, start_data, pointer_level); else @@ -185,8 +184,8 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x return res; } break; - case e_dw_pointer_type: - if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(types, type->dw_type_id))->type == e_dw_subroutine_type){ + case DW_TAG_pointer_type: + if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(types, type->dw_type_id))->type == DW_TAG_subroutine_type){ addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2); @@ -202,26 +201,41 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x pointer_level++; - if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE && addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE){ + // Some cases are not handled here: + // * the pointers lead to different areas (one to the heap, the other to the RW segment ...); + // * a pointer leads to the read-only segment of the current object; + // * a pointer lead to a different ELF object. + + // The pointers are both in the heap: + if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE){ + if(!(addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE)) + return 1; return compare_heap_area(addr_pointed1, addr_pointed2, NULL, types, other_types, type->dw_type_id, pointer_level); - }else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size && addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size){ + } + + // The pointers are both in the current object R/W segment: + else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size){ + if(!(addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size)) + return 1; if(type->dw_type_id == NULL) return (addr_pointed1 != addr_pointed2); else return compare_areas_with_type(addr_pointed1, addr_pointed2, types, other_types, type->dw_type_id, region_size, region_type, start_data, pointer_level); - }else{ + } + + else{ return (addr_pointed1 != addr_pointed2); } } break; - case e_dw_structure_type: + case DW_TAG_structure_type: xbt_dynar_foreach(type->members, cursor, member){ res = compare_areas_with_type((char *)area1 + member->offset, (char *)area2 + member->offset, types, other_types, member->dw_type_id, region_size, region_type, start_data, pointer_level); if(res == 1) return res; } break; - case e_dw_subroutine_type: + case DW_TAG_subroutine_type: return -1; break; default: @@ -248,6 +262,8 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ dw_variable_t current_var; size_t offset; void *start_data; + void* start_data_binary = mc_binary_info->start_rw; + void* start_data_libsimgrid = mc_libsimgrid_info->start_rw; mc_object_info_t object_info = NULL; mc_object_info_t other_object_info = NULL; @@ -266,10 +282,14 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ xbt_dynar_foreach(variables, cursor, current_var){ - if(region_type == 2) - offset = (char *)current_var->address.address - (char *)start_data_binary; - else - offset = (char *)current_var->address.address - (char *)start_data_libsimgrid; + // If the variable is not in this object, skip it: + // We do not expect to find a pointer to something which is not reachable + // by the global variables. + if((char*) current_var->address < (char*) object_info->start_rw + || (char*) current_var->address > (char*) object_info->end_rw) + continue; + + offset = (char *)current_var->address - (char *)object_info->start_rw; res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, types, other_types, current_var->type_origin, r1->size, region_type, start_data, 0); if(res == 1){ @@ -289,6 +309,8 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ } static int compare_local_variables(mc_snapshot_stack_t stack1, mc_snapshot_stack_t stack2, void *heap1, void *heap2){ + void* start_data_binary = mc_binary_info->start_rw; + void* start_data_libsimgrid = mc_libsimgrid_info->start_rw; if(!compared_pointers){ compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), pointers_pair_free_voidp); @@ -524,55 +546,38 @@ int snapshot_compare(void *state1, void *state2){ cursor++; } - #ifdef MC_DEBUG - if(is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); - #endif - /* Compare binary global variables */ - is_diff = compare_global_variables(2, s1->regions[2], s2->regions[2]); - if(is_diff != 0){ - #ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); - mc_comp_times->binary_global_variables_comparison_time = xbt_os_timer_elapsed(timer); - XBT_DEBUG("(%d - %d) Different global variables in binary", num1, num2); - errors++; - #else - #ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different global variables in binary", num1, num2); - #endif - reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); + const char* names[3] = { "?", "libsimgrid", "binary" }; +#ifdef MC_DEBUG + double *times[3] = { + NULL, + &mc_comp_times->libsimgrid_global_variables_comparison_time, + &mc_comp_times->binary_global_variables_comparison_time + }; +#endif - return 1; + int k=0; + for(k=2; k!=0; --k) { + #ifdef MC_DEBUG + if(is_diff == 0) + xbt_os_walltimer_stop(timer); + xbt_os_walltimer_start(timer); #endif - } - #ifdef MC_DEBUG - if(is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); - #endif - - /* Compare libsimgrid global variables */ - is_diff = compare_global_variables(1, s1->regions[1], s2->regions[1]); + /* Compare global variables */ + is_diff = compare_global_variables(k, s1->regions[k], s2->regions[k]); if(is_diff != 0){ #ifdef MC_DEBUG xbt_os_walltimer_stop(timer); - mc_comp_times->libsimgrid_global_variables_comparison_time = xbt_os_timer_elapsed(timer); - XBT_DEBUG("(%d - %d) Different global variables in libsimgrid", num1, num2); + *times[k] = xbt_os_timer_elapsed(timer); + XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, names[k]); errors++; #else #ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different global variables in libsimgrid", num1, num2); + XBT_VERB("(%d - %d) Different global variables in %s", num1, num2, names[k]); #endif - + reset_heap_information(); xbt_os_walltimer_stop(timer); xbt_os_timer_free(timer); @@ -583,6 +588,7 @@ int snapshot_compare(void *state1, void *state2){ return 1; #endif } + } #ifdef MC_DEBUG xbt_os_walltimer_start(timer);