X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37dc8526fc8f952bd56ab72b4d58b657d34cbbbd..bc3b5a95b8c6c5ddb198890a6fec1a4c62f89fee:/src/mc/mc_compare.c diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 2a49a44417..6ab29d09c6 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -63,11 +63,13 @@ static int compare_global_variables(int region_type, void *d1, void *d2){ pointer_align = (i / sizeof(void*)) * sizeof(void*); addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align)); addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align)); - if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){ + if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) + || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){ i = current_var->size; continue; }else{ - 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)){ + 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)){ res_compare = compare_area(addr_pointed1, addr_pointed2, NULL); if(res_compare == 1){ #ifdef MC_VERBOSE @@ -155,9 +157,7 @@ void stack_region_free_voidp(void *s){ } static void heap_equality_free(heap_equality_t e){ - if(e){ - xbt_free(e); - } + xbt_free(e); } void heap_equality_free_voidp(void *e){ @@ -169,21 +169,6 @@ int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, return snapshot_compare(s1, s2); } -int get_heap_region_index(mc_snapshot_t s){ - int i = 0; - while(i < s->num_reg){ - switch(s->regions[i]->type){ - case 0: - return i; - break; - default: - i++; - break; - } - } - return -1; -} - int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ int raw_mem = (mmalloc_get_current_heap() == raw_heap); @@ -302,36 +287,11 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ xbt_os_timer_start(timer); #endif - int heap_index = 0, data_libsimgrid_index = 0, data_program_index = 0; - i = 0; - - /* Get index of regions */ - while(i < s1->num_reg){ - switch(s1->region_type[i]){ - case 0: - heap_index = i; - i++; - break; - case 1: - data_libsimgrid_index = i; - i++; - while( i < s1->num_reg && s1->region_type[i] == 1) - i++; - break; - case 2: - data_program_index = i; - i++; - while( i < s1->num_reg && s1->region_type[i] == 2) - i++; - break; - } - } - /* Init heap information used in heap comparison algorithm */ - init_heap_information((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data, s1->to_ignore, s2->to_ignore); + init_heap_information((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, s1->to_ignore, s2->to_ignore); /* Compare binary global variables */ - is_diff = compare_global_variables(s1->region_type[data_program_index], s1->regions[data_program_index]->data, s2->regions[data_program_index]->data); + is_diff = compare_global_variables(2, s1->regions[2]->data, s2->regions[2]->data); if(is_diff != 0){ #ifdef MC_DEBUG xbt_os_timer_stop(timer); @@ -362,7 +322,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ #endif /* Compare libsimgrid global variables */ - is_diff = compare_global_variables(s1->region_type[data_libsimgrid_index], s1->regions[data_libsimgrid_index]->data, s2->regions[data_libsimgrid_index]->data); + is_diff = compare_global_variables(1, s1->regions[1]->data, s2->regions[1]->data); if(is_diff != 0){ #ifdef MC_DEBUG xbt_os_timer_stop(timer); @@ -435,7 +395,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ /* Compare heap */ - if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data)){ + if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data)){ #ifdef MC_DEBUG xbt_os_timer_stop(timer); @@ -523,27 +483,32 @@ static int compare_local_variables(char *s1, char *s2){ xbt_dynar_t s_tokens1, s_tokens2; unsigned int cursor = 0; void *addr1, *addr2; - char *ip1 = NULL, *ip2 = NULL; + char *frame_name1 = NULL, *frame_name2 = NULL; int res_compare = 0; - char *var_name; - + + #ifdef MC_VERBOSE + char *var_name; + #endif + while(cursor < xbt_dynar_length(tokens1)){ s_tokens1 = xbt_str_split(xbt_dynar_get_as(tokens1, cursor, char *), "="); s_tokens2 = xbt_str_split(xbt_dynar_get_as(tokens2, cursor, char *), "="); if(xbt_dynar_length(s_tokens1) > 1 && xbt_dynar_length(s_tokens2) > 1){ - var_name = xbt_dynar_get_as(s_tokens1, 0, char *); - if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "ip") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "ip") == 0)){ - xbt_free(ip1); - xbt_free(ip2); - ip1 = strdup(xbt_dynar_get_as(s_tokens1, 1, char *)); - ip2 = strdup(xbt_dynar_get_as(s_tokens2, 1, char *)); + #ifdef MC_VERBOSE + var_name = xbt_dynar_get_as(s_tokens1, 0, char *); + #endif + if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "frame_name") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "frame_name") == 0)){ + xbt_free(frame_name1); + xbt_free(frame_name2); + frame_name1 = strdup(xbt_dynar_get_as(s_tokens1, 1, char *)); + frame_name2 = strdup(xbt_dynar_get_as(s_tokens2, 1, char *)); } addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16); addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16); if(addr1 > std_heap && (char *)addr1 <= (char *)std_heap + STD_HEAP_SIZE && addr2 > std_heap && (char *)addr2 <= (char *)std_heap + STD_HEAP_SIZE){ res_compare = compare_area(addr1, addr2, NULL); if(res_compare == 1){ - if(is_stack_ignore_variable(ip1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(ip2, xbt_dynar_get_as(s_tokens2, 0, char *))){ + if(is_stack_ignore_variable(frame_name1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(frame_name2, xbt_dynar_get_as(s_tokens2, 0, char *))){ xbt_dynar_free(&s_tokens1); xbt_dynar_free(&s_tokens2); cursor++; @@ -556,8 +521,28 @@ static int compare_local_variables(char *s1, char *s2){ xbt_dynar_free(&s_tokens2); xbt_dynar_free(&tokens1); xbt_dynar_free(&tokens2); - xbt_free(ip1); - xbt_free(ip2); + xbt_free(frame_name1); + xbt_free(frame_name2); + return 1; + } + } + }else{ + if(strcmp(xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)) != 0){ + if(is_stack_ignore_variable(frame_name1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(frame_name2, xbt_dynar_get_as(s_tokens2, 0, char *))){ + xbt_dynar_free(&s_tokens1); + xbt_dynar_free(&s_tokens2); + cursor++; + continue; + }else { + #ifdef MC_VERBOSE + XBT_VERB("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)); + #endif + xbt_dynar_free(&s_tokens1); + xbt_dynar_free(&s_tokens2); + xbt_dynar_free(&tokens1); + xbt_dynar_free(&tokens2); + xbt_free(frame_name1); + xbt_free(frame_name2); return 1; } } @@ -569,8 +554,8 @@ static int compare_local_variables(char *s1, char *s2){ cursor++; } - xbt_free(ip1); - xbt_free(ip2); + xbt_free(frame_name1); + xbt_free(frame_name2); xbt_dynar_free(&tokens1); xbt_dynar_free(&tokens2); return 0;