X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74b753c075bcd054409e619771d3b5967cfdb60e..71b11e6426999ead46f97083ad7eec3f288c9cdb:/src/mc/mc_compare.c?ds=sidebyside diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 1037bf8efd..69184599b8 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -1,8 +1,11 @@ -/* Copyright (c) 2012-2013 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "mc_private.h" #include "xbt/mmalloc.h" @@ -15,16 +18,32 @@ typedef struct s_pointers_pair{ void *p2; }s_pointers_pair_t, *pointers_pair_t; -xbt_dynar_t compared_pointers; +__thread xbt_dynar_t compared_pointers; -static int heap_region_compare(void *d1, void *d2, size_t size); +/************************** Free functions ****************************/ +/********************************************************************/ -static void stack_region_free(stack_region_t s); +static void stack_region_free(stack_region_t s){ + if(s){ + xbt_free(s->process_name); + xbt_free(s); + } +} -static int compare_local_variables(mc_snapshot_stack_t stack1, mc_snapshot_stack_t stack2, void *heap1, void *heap2); -static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_region_t r2); -static int compare_pointer(char *pointer_type, void *addr_pointed1, void *addr_pointed2, int region_size, int region_type); -static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, xbt_dict_t other_types, char *type_id, int region_size, int region_type, void *start_data, int pointer_level); +static void stack_region_free_voidp(void *s){ + stack_region_free((stack_region_t) * (void **) s); +} + +static void pointers_pair_free(pointers_pair_t p){ + xbt_free(p); +} + +static void pointers_pair_free_voidp(void *p){ + pointers_pair_free((pointers_pair_t) * (void **)p); +} + +/************************** Snapshot comparison *******************************/ +/******************************************************************************/ static int already_compared_pointers(void *p1, void *p2){ @@ -77,9 +96,10 @@ static void add_compared_pointers(void *p1, void *p2){ cursor = (start + end) / 2; pair = (pointers_pair_t)xbt_dynar_get_as(compared_pointers, cursor, pointers_pair_t); if(pair->p1 == p1){ - if(pair->p2 == p2) + if(pair->p2 == p2){ + pointers_pair_free(new_pair); return; - else if(pair->p2 < p2) + }else if(pair->p2 < p2) start = cursor + 1; else end = cursor - 1; @@ -104,72 +124,68 @@ static void add_compared_pointers(void *p1, void *p2){ } -static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, xbt_dict_t other_types, char *type_id, int region_size, int region_type, void *start_data, int pointer_level){ +static int compare_areas_with_type(void *area1, void *area2, mc_object_info_t info, mc_object_info_t other_info, dw_type_t type, int region_size, int region_type, void *start_data, int pointer_level){ - dw_type_t type = xbt_dict_get_or_null(types, type_id);; unsigned int cursor = 0; dw_type_t member, subtype, subsubtype; int elm_size, i, res, switch_types = 0; void *addr_pointed1, *addr_pointed2; - int pointed_area_size1, pointed_area_size2; 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: - return compare_areas_with_type(area1, area2, types, other_types, type->dw_type_id, region_size, region_type, start_data, pointer_level); + case DW_TAG_typedef: + case DW_TAG_volatile_type: + case DW_TAG_const_type: + return compare_areas_with_type(area1, area2, info, other_info, type->subtype, 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: - subtype = xbt_dict_get_or_null(types, type->dw_type_id); + case DW_TAG_array_type: + subtype = type->subtype; 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 */ - 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)); + 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 */ + dw_type_t full_type = xbt_dict_get_or_null(other_info->types_by_name, subtype->name); + if(full_type) { + type = full_type; + } else { + subtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name); switch_types = 1; } } - elm_size = subtype->size; + elm_size = subtype->byte_size; break; - case e_dw_typedef: - case e_dw_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 */ - 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)); + case DW_TAG_const_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: + subsubtype = subtype->subtype; + if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ + subsubtype = xbt_dict_get_or_null(other_info->types_by_name, 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); + res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), other_info, info, type->subtype, region_size, region_type, start_data, pointer_level); else - res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), types, other_types, type->dw_type_id, region_size, region_type, start_data, pointer_level); - if(res != 0) + res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), info, other_info, type->subtype, region_size, region_type, start_data, pointer_level); + if(res == 1) 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(info->types, type->dw_type_id))->type == DW_TAG_subroutine_type){ addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2); @@ -177,8 +193,6 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); - if((addr_pointed1 == addr_pointed2) && ((pointed_area_size1 = get_pointed_area_size(addr_pointed1, 1)) != (pointed_area_size2 = get_pointed_area_size(addr_pointed2, 2)))) - return -1; if(addr_pointed1 == NULL && addr_pointed2 == NULL) return 0; if(already_compared_pointers(addr_pointed1, addr_pointed2) != -1) @@ -187,26 +201,42 @@ 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){ - 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){ + // 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)) + xbt_die("Die"); + return compare_heap_area(addr_pointed1, addr_pointed2, NULL, info, other_info, type->dw_type_id, pointer_level); + } + + // 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)) + xbt_die("Die"); 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{ - return (addr_pointed1 != addr_pointed2); + return compare_areas_with_type(addr_pointed1, addr_pointed2, info, other_info, type->subtype, region_size, region_type, start_data, pointer_level); + } + + 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); + XBT_DEBUG("Compare member %s", member->name); + res = compare_areas_with_type((char *)area1 + member->offset, (char *)area2 + member->offset, info, other_info, member->subtype, 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: @@ -220,56 +250,69 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_region_t r2){ if(!compared_pointers){ - compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), NULL); + compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), pointers_pair_free_voidp); MC_ignore_global_variable("compared_pointers"); }else{ xbt_dynar_reset(compared_pointers); } xbt_dynar_t variables; - xbt_dict_t types, other_types; int res; unsigned int cursor = 0; 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; if(region_type == 2){ - variables = mc_global_variables_binary; - types = mc_variables_type_binary; - other_types = mc_variables_type_libsimgrid; + object_info = mc_binary_info; + other_object_info = mc_libsimgrid_info; start_data = start_data_binary; }else{ - variables = mc_global_variables_libsimgrid; - types = mc_variables_type_libsimgrid; - other_types = mc_variables_type_binary; + object_info = mc_libsimgrid_info; + other_object_info = mc_binary_info; start_data = start_data_libsimgrid; } + variables = object_info->global_variables; 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; - - 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){ - xbt_dynar_cursor_rm(variables, &cursor); - }else if(res == 1){ - XBT_VERB("Global variable %s is different between snapshots", current_var->name); + // 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; + + dw_type_t bvariable_type = xbt_dict_get_or_null(object_info->types, current_var->type_origin); + res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, object_info, other_object_info, bvariable_type, r1->size, region_type, start_data, 0); + if(res == 1){ + XBT_VERB("Global variable %s (%p - %p) is different between snapshots", current_var->name, (char *)r1->data + offset, (char *)r2->data + offset); + xbt_dynar_free(&compared_pointers); + compared_pointers = NULL; return 1; } } + + xbt_dynar_free(&compared_pointers); + compared_pointers = NULL; + return 0; } 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), NULL); + compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), pointers_pair_free_voidp); MC_ignore_global_variable("compared_pointers"); }else{ xbt_dynar_reset(compared_pointers); @@ -277,6 +320,8 @@ static int compare_local_variables(mc_snapshot_stack_t stack1, mc_snapshot_stack if(xbt_dynar_length(stack1->local_variables) != xbt_dynar_length(stack2->local_variables)){ XBT_VERB("Different number of local variables"); + xbt_dynar_free(&compared_pointers); + compared_pointers = NULL; return 1; }else{ unsigned int cursor = 0; @@ -285,64 +330,61 @@ static int compare_local_variables(mc_snapshot_stack_t stack1, mc_snapshot_stack while(cursor < xbt_dynar_length(stack1->local_variables)){ current_var1 = (local_variable_t)xbt_dynar_get_as(stack1->local_variables, cursor, local_variable_t); current_var2 = (local_variable_t)xbt_dynar_get_as(stack2->local_variables, cursor, local_variable_t); - if(strcmp(current_var1->name, current_var2->name) != 0 || strcmp(current_var1->frame, current_var2->frame) != 0 || current_var1->ip != current_var2->ip) + if(strcmp(current_var1->name, current_var2->name) != 0 || strcmp(current_var1->frame, current_var2->frame) != 0 || current_var1->ip != current_var2->ip){ + xbt_dynar_free(&compared_pointers); + XBT_VERB("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)", current_var1->name, current_var2->name, current_var1->frame, current_var2->frame, current_var1->ip, current_var2->ip); return 1; + } offset1 = (char *)current_var1->address - (char *)std_heap; offset2 = (char *)current_var2->address - (char *)std_heap; - if(current_var1->region == 1) - res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_variables_type_libsimgrid, mc_variables_type_binary, current_var1->type, 0, 1, start_data_libsimgrid, 0l); - else - res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_variables_type_binary, mc_variables_type_libsimgrid, current_var1->type, 0, 2, start_data_binary, 0l); + XBT_DEBUG("Compare local variable %s of frame %s", current_var1->name, current_var1->frame); + + + if(current_var1->region == 1) { + dw_type_t subtype = xbt_dict_get_or_null(mc_libsimgrid_info->types, current_var1->type); + res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_libsimgrid_info, mc_binary_info, subtype, 0, 1, start_data_libsimgrid, 0); + } else { + dw_type_t subtype = xbt_dict_get_or_null(mc_binary_info->types, current_var1->type); + res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, mc_binary_info, mc_libsimgrid_info, subtype, 0, 2, start_data_binary, 0); + } if(res == 1){ - XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name, (char *)heap1 + offset1, (char *)heap2 + offset2, current_var1->frame); + XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name,(char *)heap1 + offset1, (char *)heap2 + offset2, current_var1->frame); + xbt_dynar_free(&compared_pointers); + compared_pointers = NULL; return res; } cursor++; } + xbt_dynar_free(&compared_pointers); + compared_pointers = NULL; return 0; } } +int snapshot_compare(void *state1, void *state2){ -static int heap_region_compare(void *d1, void *d2, size_t size){ - - size_t i = 0; + mc_snapshot_t s1, s2; + int num1, num2; - for(i=0; igraph_state->system_state; + s2 = ((mc_visited_pair_t)state2)->graph_state->system_state; + num1 = ((mc_visited_pair_t)state1)->num; + num2 = ((mc_visited_pair_t)state2)->num; + /* Firstly compare automaton state */ + /*if(xbt_automaton_state_compare(((mc_pair_t)state1)->automaton_state, ((mc_pair_t)state2)->automaton_state) != 0) return 1; - } + if(xbt_automaton_propositional_symbols_compare_value(((mc_pair_t)state1)->atomic_propositions, ((mc_pair_t)state2)->atomic_propositions) != 0) + return 1;*/ + }else{ /* Safety MC */ + s1 = ((mc_visited_state_t)state1)->system_state; + s2 = ((mc_visited_state_t)state2)->system_state; + num1 = ((mc_visited_state_t)state1)->num; + num2 = ((mc_visited_state_t)state2)->num; } - - return 0; -} -static void stack_region_free(stack_region_t s){ - if(s){ - xbt_free(s->process_name); - xbt_free(s); - } -} - -void stack_region_free_voidp(void *s){ - stack_region_free((stack_region_t) * (void **) s); -} - -int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, - mc_snapshot_t s1, mc_snapshot_t s2){ - return snapshot_compare(s1, s2); -} - -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ - - int raw_mem = (mmalloc_get_current_heap() == raw_heap); - - MC_SET_RAW_MEM; - int errors = 0; + int res_init; xbt_os_timer_t global_timer = xbt_os_timer_new(); xbt_os_timer_t timer = xbt_os_timer_new(); @@ -353,10 +395,21 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ xbt_os_walltimer_start(timer); #endif - /* Compare size of stacks */ + if(MC_USE_SNAPSHOT_HASH) { + if(s1->hash != s2->hash) { + XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash); + return 1; + } else { + XBT_VERB("(%d - %d) Same hash : 0x%" PRIx64, num1, num2, s1->hash); + } + } + int i = 0; size_t size_used1, size_used2; int is_diff = 0; + + + /* Compare size of stacks */ while(i < xbt_dynar_length(s1->stacks)){ size_used1 = s1->stack_sizes[i]; size_used2 = s2->stack_sizes[i]; @@ -366,22 +419,20 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ xbt_os_walltimer_stop(timer); mc_comp_times->stacks_sizes_comparison_time = xbt_os_timer_elapsed(timer); } - XBT_DEBUG("Different size used in stacks : %zu - %zu", size_used1, size_used2); + XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1, num2, size_used1, size_used2); errors++; is_diff = 1; #else #ifdef MC_VERBOSE - XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2); + XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1, num2, size_used1, size_used2); #endif + 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); - if(!raw_mem) - MC_UNSET_RAW_MEM; - return 1; #endif } @@ -394,69 +445,29 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ xbt_os_walltimer_start(timer); #endif - /* Compare hash of global variables */ - if(s1->hash_global != NULL && s2->hash_global != NULL){ - if(strcmp(s1->hash_global, s2->hash_global) != 0){ - #ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); - mc_comp_times->hash_global_variables_comparison_time = xbt_os_timer_elapsed(timer); - XBT_DEBUG("Different hash of global variables : %s - %s", s1->hash_global, s2->hash_global); + /* Init heap information used in heap comparison algorithm */ + res_init = init_heap_information((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, s1->to_ignore, s2->to_ignore); + if(res_init == -1){ + #ifdef MC_DEBUG + XBT_DEBUG("(%d - %d) Different heap information", num1, num2); errors++; #else #ifdef MC_VERBOSE - XBT_VERB("Different hash of global variables : %s - %s", s1->hash_global, s2->hash_global); + XBT_VERB("(%d - %d) Different heap information", num1, num2); #endif - 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); - - if(!raw_mem) - MC_UNSET_RAW_MEM; return 1; #endif - } } #ifdef MC_DEBUG xbt_os_walltimer_start(timer); #endif - /* Compare hash of local variables */ - if(s1->hash_local != NULL && s2->hash_local != NULL){ - if(strcmp(s1->hash_local, s2->hash_local) != 0){ - #ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); - mc_comp_times->hash_local_variables_comparison_time = xbt_os_timer_elapsed(timer); - XBT_DEBUG("Different hash of local variables : %s - %s", s1->hash_local, s2->hash_local); - errors++; - #else - #ifdef MC_VERBOSE - XBT_VERB("Different hash of local variables : %s - %s", s1->hash_local, s2->hash_local); - #endif - - 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); - - if(!raw_mem) - MC_UNSET_RAW_MEM; - - return 1; - #endif - } - } - - #ifdef MC_DEBUG - xbt_os_walltimer_start(timer); - #endif - - /* Init heap information used in heap comparison algorithm */ - init_heap_information((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, s1->to_ignore, s2->to_ignore); - /* Stacks comparison */ unsigned int cursor = 0; int diff_local = 0; @@ -473,122 +484,100 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ xbt_os_walltimer_stop(timer); mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer); } - XBT_DEBUG("Different local variables between stacks %d", cursor + 1); + XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1, num2, cursor + 1); errors++; is_diff = 1; #else #ifdef MC_VERBOSE - XBT_VERB("Different local variables between stacks %d", cursor + 1); + XBT_VERB("(%d - %d) Different local variables between stacks %d", num1, num2, cursor + 1); #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); - - if(!raw_mem) - MC_UNSET_RAW_MEM; - + return 1; #endif } 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("Different global variables in binary"); - errors++; - #else - #ifdef MC_VERBOSE - XBT_VERB("Different global variables in binary"); - #endif - reset_heap_information(); - 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); - - if(!raw_mem) - MC_UNSET_RAW_MEM; + 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("Different global variables in libsimgrid"); + *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("Different global variables in libsimgrid"); + 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); xbt_os_walltimer_stop(global_timer); mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); xbt_os_timer_free(global_timer); - - if(!raw_mem) - MC_UNSET_RAW_MEM; return 1; #endif } - + } + #ifdef MC_DEBUG xbt_os_walltimer_start(timer); #endif /* Compare heap */ - if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data) > 0){ + if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, + (xbt_mheap_t)s2->regions[0]->data, + mc_libsimgrid_info, + mc_binary_info) > 0){ #ifdef MC_DEBUG xbt_os_walltimer_stop(timer); mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer); - XBT_DEBUG("Different heap (mmalloc_compare)"); + XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2); errors++; #else - - xbt_os_timer_free(timer); #ifdef MC_VERBOSE - XBT_VERB("Different heap (mmalloc_compare)"); + XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", 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); - if(!raw_mem) - MC_UNSET_RAW_MEM; - return 1; #endif }else{ @@ -598,7 +587,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ } reset_heap_information(); - + + xbt_os_walltimer_stop(timer); xbt_os_timer_free(timer); #ifdef MC_VERBOSE @@ -612,20 +602,16 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ print_comparison_times(); #endif - if(!raw_mem) - MC_UNSET_RAW_MEM; - +#ifdef MC_VERBOSE + if(errors==0) + XBT_VERB("(%d - %d) No difference found", num1, num2); +#endif return errors > 0; } -int MC_compare_snapshots(void *s1, void *s2){ - - MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); - - return simcall_mc_compare_snapshots(s1, s2); - -} +/***************************** Statistics *****************************/ +/*******************************************************************/ void print_comparison_times(){ XBT_DEBUG("*** Comparison times ***"); @@ -637,3 +623,18 @@ void print_comparison_times(){ XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time); XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time); } + +/**************************** MC snapshot compare simcall **************************/ +/***********************************************************************************/ + +int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, + mc_snapshot_t s1, mc_snapshot_t s2){ + return snapshot_compare(s1, s2); +} + +int MC_compare_snapshots(void *s1, void *s2){ + + MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); + return simcall_mc_compare_snapshots(s1, s2); + +}