X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b8c19c2b3028ebeef9f76f159af56acd5739c6d..9788cd051f72b982ec571c96e84577e9749188b1:/src/mc/mc_compare.c diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 5d8ac72471..b58023327b 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -1,4 +1,5 @@ -/* 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. */ @@ -15,16 +16,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 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); +} -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); +/************************** Snapshot comparison *******************************/ +/******************************************************************************/ static int already_compared_pointers(void *p1, void *p2){ @@ -77,9 +94,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; @@ -111,7 +129,6 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x 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: @@ -164,7 +181,7 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x 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 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) + if(res == 1) return res; } break; @@ -177,8 +194,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) @@ -193,9 +208,9 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x 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); + 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 (addr_pointed1 != addr_pointed2); } } break; @@ -220,8 +235,8 @@ 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); - MC_ignore_global_variable("compared_pointers", 1); + 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); } @@ -254,14 +269,18 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ 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(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; } @@ -269,14 +288,16 @@ 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){ if(!compared_pointers){ - compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), NULL); - MC_ignore_global_variable("compared_pointers", 1); + 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); } 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 +306,49 @@ 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); 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); + 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, 0); 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); - if(res != 0){ - XBT_VERB("Local variable %s in frame %s is different between snapshots", current_var1->name, current_var1->frame); + 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, 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_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_pair_t)state2)->graph_state->system_state; + num1 = ((mc_pair_t)state1)->num; + num2 = ((mc_pair_t)state2)->num; + }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(); @@ -366,22 +372,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 } @@ -407,13 +411,11 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ XBT_VERB("Different hash of global variables : %s - %s", s1->hash_global, s2->hash_global); #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 @@ -437,14 +439,12 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ XBT_VERB("Different hash of local variables : %s - %s", s1->hash_local, s2->hash_local); #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 } @@ -455,7 +455,27 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ #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); + 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("(%d - %d) Different heap information", num1, num2); + #endif + + xbt_os_walltimer_stop(global_timer); + mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); + xbt_os_timer_free(global_timer); + + return 1; + #endif + } + + #ifdef MC_DEBUG + xbt_os_walltimer_start(timer); + #endif /* Stacks comparison */ unsigned int cursor = 0; @@ -473,24 +493,22 @@ 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 } @@ -509,21 +527,19 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ #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"); + XBT_DEBUG("(%d - %d) Different global variables in binary", num1, num2); errors++; #else #ifdef MC_VERBOSE - XBT_VERB("Different global variables in binary"); + 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); - - if(!raw_mem) - MC_UNSET_RAW_MEM; return 1; #endif @@ -541,26 +557,24 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ #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"); + XBT_DEBUG("(%d - %d) Different global variables in libsimgrid", num1, num2); errors++; #else #ifdef MC_VERBOSE - XBT_VERB("Different global variables in libsimgrid"); + XBT_VERB("(%d - %d) Different global variables in libsimgrid", 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 } - + #ifdef MC_DEBUG xbt_os_walltimer_start(timer); #endif @@ -571,24 +585,21 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ #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 +609,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 +624,12 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ print_comparison_times(); #endif - if(!raw_mem) - MC_UNSET_RAW_MEM; - return errors > 0; } -int MC_compare_snapshots(void *s1, void *s2){ - - MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot", 1); - - return simcall_mc_compare_snapshots(s1, s2); - -} +/***************************** Statistics *****************************/ +/*******************************************************************/ void print_comparison_times(){ XBT_DEBUG("*** Comparison times ***"); @@ -637,3 +641,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); + +}