X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a308bb217e5abbd93413e23cb59776c3f6d1d8db..fe676bdf59f9b7bc9ab2868caf5ca56789367419:/src/mc/mc_diff.c diff --git a/src/mc/mc_diff.c b/src/mc/mc_diff.c index d65279d177..5f66c883a6 100644 --- a/src/mc/mc_diff.c +++ b/src/mc/mc_diff.c @@ -6,7 +6,7 @@ /* 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 "xbt/ex_interface.h" /* internals of backtrace setup */ +#include "xbt/ex_interface.h" /* internals of backtrace setup */ #include "xbt/str.h" #include "mc/mc.h" #include "xbt/mmalloc.h" @@ -24,7 +24,8 @@ void *maestro_stack_start, *maestro_stack_end; /********************************* Backtrace ***********************************/ /******************************************************************************/ -static void mmalloc_backtrace_block_display(void* heapinfo, int block){ +static void mmalloc_backtrace_block_display(void *heapinfo, int block) +{ /* xbt_ex_t e; */ @@ -51,7 +52,9 @@ static void mmalloc_backtrace_block_display(void* heapinfo, int block){ /* } */ } -static void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){ +static void mmalloc_backtrace_fragment_display(void *heapinfo, int block, + int frag) +{ /* xbt_ex_t e; */ @@ -74,11 +77,12 @@ static void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int fr } -static void mmalloc_backtrace_display(void *addr){ +static void mmalloc_backtrace_display(void *addr) +{ /* size_t block, frag_nb; */ /* int type; */ - + /* xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); */ /* block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1); */ @@ -105,25 +109,26 @@ static void mmalloc_backtrace_display(void *addr){ } -static int compare_backtrace(int b1, int f1, int b2, int f2){ +static int compare_backtrace(int b1, int f1, int b2, int f2) +{ /*int i = 0; - if(f1 != -1){ - for(i=0; i< XBT_BACKTRACE_SIZE; i++){ - if(heapinfo1[b1].busy_frag.bt[f1][i] != heapinfo2[b2].busy_frag.bt[f2][i]){ - //mmalloc_backtrace_fragment_display((void*)heapinfo1, b1, f1); - //mmalloc_backtrace_fragment_display((void*)heapinfo2, b2, f2); - return 1; - } - } - }else{ - for(i=0; i< heapinfo1[b1].busy_block.bt_size; i++){ - if(heapinfo1[b1].busy_block.bt[i] != heapinfo2[b2].busy_block.bt[i]){ - //mmalloc_backtrace_block_display((void*)heapinfo1, b1); - //mmalloc_backtrace_block_display((void*)heapinfo2, b2); - return 1; - } - } - }*/ + if(f1 != -1){ + for(i=0; i< XBT_BACKTRACE_SIZE; i++){ + if(heapinfo1[b1].busy_frag.bt[f1][i] != heapinfo2[b2].busy_frag.bt[f2][i]){ + //mmalloc_backtrace_fragment_display((void*)heapinfo1, b1, f1); + //mmalloc_backtrace_fragment_display((void*)heapinfo2, b2, f2); + return 1; + } + } + }else{ + for(i=0; i< heapinfo1[b1].busy_block.bt_size; i++){ + if(heapinfo1[b1].busy_block.bt[i] != heapinfo2[b2].busy_block.bt[i]){ + //mmalloc_backtrace_block_display((void*)heapinfo1, b1); + //mmalloc_backtrace_block_display((void*)heapinfo2, b2); + return 1; + } + } + } */ return 0; } @@ -131,7 +136,7 @@ static int compare_backtrace(int b1, int f1, int b2, int f2){ /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ -typedef char* type_name; +typedef char *type_name; struct s_mc_diff { /** \brief Base address of the real heap */ @@ -155,27 +160,31 @@ struct s_mc_diff { #define types1_(i,j) types1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] #define types2_(i,j) types2[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] -__thread struct s_mc_diff* mc_diff_info = NULL; +__thread struct s_mc_diff *mc_diff_info = NULL; /*********************************** Free functions ************************************/ -static void heap_area_pair_free(heap_area_pair_t pair){ +static void heap_area_pair_free(heap_area_pair_t pair) +{ xbt_free(pair); pair = NULL; } -static void heap_area_pair_free_voidp(void *d){ +static void heap_area_pair_free_voidp(void *d) +{ heap_area_pair_free((heap_area_pair_t) * (void **) d); } -static void heap_area_free(heap_area_t area){ +static void heap_area_free(heap_area_t area) +{ xbt_free(area); area = NULL; } /************************************************************************************/ -static s_heap_area_t make_heap_area(int block, int fragment){ +static s_heap_area_t make_heap_area(int block, int fragment) +{ s_heap_area_t area; area.valid = 1; area.block = block; @@ -183,31 +192,37 @@ static s_heap_area_t make_heap_area(int block, int fragment){ return area; } - -static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){ - + +static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, + int block2, int fragment2) +{ + unsigned int cursor = 0; heap_area_pair_t current_pair; - xbt_dynar_foreach(list, cursor, current_pair){ - if(current_pair->block1 == block1 && current_pair->block2 == block2 && current_pair->fragment1 == fragment1 && current_pair->fragment2 == fragment2) - return 0; + xbt_dynar_foreach(list, cursor, current_pair) { + if (current_pair->block1 == block1 && current_pair->block2 == block2 + && current_pair->fragment1 == fragment1 + && current_pair->fragment2 == fragment2) + return 0; } - + return 1; } -static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){ +static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, + int block2, int fragment2) +{ - if(is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)){ + if (is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) { heap_area_pair_t pair = NULL; pair = xbt_new0(s_heap_area_pair_t, 1); pair->block1 = block1; pair->fragment1 = fragment1; pair->block2 = block2; pair->fragment2 = fragment2; - - xbt_dynar_push(list, &pair); + + xbt_dynar_push(list, &pair); return 1; } @@ -215,67 +230,78 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int b return 0; } -static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ +static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, + void *address) +{ unsigned int cursor = 0; int start = 0; int end = xbt_dynar_length(ignore_list) - 1; mc_heap_ignore_region_t region; - while(start <= end){ + while (start <= end) { cursor = (start + end) / 2; - region = (mc_heap_ignore_region_t)xbt_dynar_get_as(ignore_list, cursor, mc_heap_ignore_region_t); - if(region->address == address) + region = + (mc_heap_ignore_region_t) xbt_dynar_get_as(ignore_list, cursor, + mc_heap_ignore_region_t); + if (region->address == address) return region->size; - if(region->address < address) + if (region->address < address) start = cursor + 1; - if(region->address > address) - end = cursor - 1; + if (region->address > address) + end = cursor - 1; } return -1; } -static int is_stack(void *address){ +static int is_stack(void *address) +{ unsigned int cursor = 0; stack_region_t stack; - xbt_dynar_foreach(stacks_areas, cursor, stack){ - if(address == stack->address) + xbt_dynar_foreach(stacks_areas, cursor, stack) { + if (address == stack->address) return 1; } return 0; } -static int is_block_stack(int block){ +static int is_block_stack(int block) +{ unsigned int cursor = 0; stack_region_t stack; - xbt_dynar_foreach(stacks_areas, cursor, stack){ - if(block == stack->block) + xbt_dynar_foreach(stacks_areas, cursor, stack) { + if (block == stack->block) return 1; } return 0; } -static void match_equals(struct s_mc_diff *state, xbt_dynar_t list){ +static void match_equals(struct s_mc_diff *state, xbt_dynar_t list) +{ unsigned int cursor = 0; heap_area_pair_t current_pair; - xbt_dynar_foreach(list, cursor, current_pair){ + xbt_dynar_foreach(list, cursor, current_pair) { + + if (current_pair->fragment1 != -1) { - if(current_pair->fragment1 != -1){ + state->equals_to1_(current_pair->block1, current_pair->fragment1) = + make_heap_area(current_pair->block2, current_pair->fragment2); + state->equals_to2_(current_pair->block2, current_pair->fragment2) = + make_heap_area(current_pair->block1, current_pair->fragment1); - state->equals_to1_(current_pair->block1,current_pair->fragment1) = make_heap_area(current_pair->block2, current_pair->fragment2); - state->equals_to2_(current_pair->block2,current_pair->fragment2) = make_heap_area(current_pair->block1, current_pair->fragment1); - - }else{ + } else { - state->equals_to1_(current_pair->block1,0) = make_heap_area(current_pair->block2, current_pair->fragment2); - state->equals_to2_(current_pair->block2,0) = make_heap_area(current_pair->block1, current_pair->fragment1); + state->equals_to1_(current_pair->block1, 0) = + make_heap_area(current_pair->block2, current_pair->fragment2); + state->equals_to2_(current_pair->block2, 0) = + make_heap_area(current_pair->block1, current_pair->fragment1); } @@ -289,9 +315,11 @@ static void match_equals(struct s_mc_diff *state, xbt_dynar_t list){ * @param b2 Block of state 2 * @return if the blocks are known to be matching */ -static int equal_blocks(struct s_mc_diff *state, int b1, int b2){ - - if(state->equals_to1_(b1,0).block == b2 && state->equals_to2_(b2,0).block == b1) +static int equal_blocks(struct s_mc_diff *state, int b1, int b2) +{ + + if (state->equals_to1_(b1, 0).block == b2 + && state->equals_to2_(b2, 0).block == b1) return 1; return 0; @@ -306,19 +334,23 @@ static int equal_blocks(struct s_mc_diff *state, int b1, int b2){ * @param f2 Fragment of state 2 * @return if the fragments are known to be matching */ -static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, int f2){ - - if(state->equals_to1_(b1,f1).block == b2 - && state->equals_to1_(b1,f1).fragment == f2 - && state->equals_to2_(b2,f2).block == b1 - && state->equals_to2_(b2,f2).fragment == f1) +static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, + int f2) +{ + + if (state->equals_to1_(b1, f1).block == b2 + && state->equals_to1_(b1, f1).fragment == f2 + && state->equals_to2_(b2, f2).block == b1 + && state->equals_to2_(b2, f2).fragment == f1) return 1; return 0; } -int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){ - if(mc_diff_info==NULL) { +int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, + xbt_dynar_t i2) +{ + if (mc_diff_info == NULL) { mc_diff_info = xbt_new0(struct s_mc_diff, 1); mc_diff_info->equals_to1 = NULL; mc_diff_info->equals_to2 = NULL; @@ -327,41 +359,69 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, } struct s_mc_diff *state = mc_diff_info; - if((((struct mdesc *)heap1)->heaplimit != ((struct mdesc *)heap2)->heaplimit) - || ((((struct mdesc *)heap1)->heapsize != ((struct mdesc *)heap2)->heapsize) )) + if ((((struct mdesc *) heap1)->heaplimit != + ((struct mdesc *) heap2)->heaplimit) + || + ((((struct mdesc *) heap1)->heapsize != + ((struct mdesc *) heap2)->heapsize))) return -1; - state->heaplimit = ((struct mdesc *)heap1)->heaplimit; + state->heaplimit = ((struct mdesc *) heap1)->heaplimit; // Mamailloute in order to find the base address of the main heap: - state->s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - xbt_pagesize; - - state->heapbase1 = (char *)heap1 + BLOCKSIZE; - state->heapbase2 = (char *)heap2 + BLOCKSIZE; - - state->heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)((struct mdesc *)heap1)->heapinfo - (char *)state->s_heap))); - state->heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)((struct mdesc *)heap2)->heapinfo - (char *)state->s_heap))); + state->s_heap = + (char *) mmalloc_get_current_heap() - STD_HEAP_SIZE - xbt_pagesize; + + state->heapbase1 = (char *) heap1 + BLOCKSIZE; + state->heapbase2 = (char *) heap2 + BLOCKSIZE; + + state->heapinfo1 = + (malloc_info *) ((char *) heap1 + + ((uintptr_t) + ((char *) ((struct mdesc *) heap1)->heapinfo - + (char *) state->s_heap))); + state->heapinfo2 = + (malloc_info *) ((char *) heap2 + + ((uintptr_t) + ((char *) ((struct mdesc *) heap2)->heapinfo - + (char *) state->s_heap))); state->heapsize1 = heap1->heapsize; state->heapsize2 = heap2->heapsize; state->to_ignore1 = i1; - state-> to_ignore2 = i2; - - if(state->heaplimit > state->available) { - state->equals_to1 = realloc(state->equals_to1, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - state->types1 = realloc(state->types1, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); - state->equals_to2 = realloc(state->equals_to2, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - state->types2 = realloc(state->types2, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); + state->to_ignore2 = i2; + + if (state->heaplimit > state->available) { + state->equals_to1 = + realloc(state->equals_to1, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * + sizeof(s_heap_area_t)); + state->types1 = + realloc(state->types1, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * + sizeof(type_name *)); + state->equals_to2 = + realloc(state->equals_to2, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * + sizeof(s_heap_area_t)); + state->types2 = + realloc(state->types2, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * + sizeof(type_name *)); state->available = state->heaplimit; } - memset(state->equals_to1, 0, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - memset(state->equals_to2, 0, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - memset(state->types1, 0, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); - memset(state->types2, 0, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); + memset(state->equals_to1, 0, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); + memset(state->equals_to2, 0, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); + memset(state->types1, 0, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); + memset(state->types2, 0, + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); - if(MC_is_active()){ + if (MC_is_active()) { MC_ignore_global_variable("mc_diff_info"); } @@ -369,15 +429,18 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, } -void reset_heap_information(){ +void reset_heap_information() +{ } -int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_mheap_t heap1, xbt_mheap_t heap2){ +int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, + xbt_mheap_t heap1, xbt_mheap_t heap2) +{ struct s_mc_diff *state = mc_diff_info; - if(heap1 == NULL && heap2 == NULL){ + if (heap1 == NULL && heap2 == NULL) { XBT_DEBUG("Malloc descriptors null"); return 0; } @@ -387,93 +450,104 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; int nb_diff1 = 0, nb_diff2 = 0; - xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); + xbt_dynar_t previous = + xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); int equal, res_compare = 0; - /* Check busy blocks*/ + /* Check busy blocks */ i1 = 1; - while(i1 <= state->heaplimit){ + while (i1 <= state->heaplimit) { - if(state->heapinfo1[i1].type == -1){ /* Free block */ + if (state->heapinfo1[i1].type == -1) { /* Free block */ i1++; continue; } - addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); + addr_block1 = + ((void *) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); + + if (state->heapinfo1[i1].type == 0) { /* Large block */ - if(state->heapinfo1[i1].type == 0){ /* Large block */ - - if(is_stack(addr_block1)){ - for(k=0; k < state->heapinfo1[i1].busy_block.size; k++) - state->equals_to1_(i1+k,0) = make_heap_area(i1, -1); - for(k=0; k < state->heapinfo2[i1].busy_block.size; k++) - state->equals_to2_(i1+k,0) = make_heap_area(i1, -1); + if (is_stack(addr_block1)) { + for (k = 0; k < state->heapinfo1[i1].busy_block.size; k++) + state->equals_to1_(i1 + k, 0) = make_heap_area(i1, -1); + for (k = 0; k < state->heapinfo2[i1].busy_block.size; k++) + state->equals_to2_(i1 + k, 0) = make_heap_area(i1, -1); i1 += state->heapinfo1[i1].busy_block.size; continue; } - if(state->equals_to1_(i1,0).valid){ + if (state->equals_to1_(i1, 0).valid) { i1++; continue; } - + i2 = 1; equal = 0; res_compare = 0; - + /* Try first to associate to same block in the other heap */ - if(state->heapinfo2[i1].type == state->heapinfo1[i1].type){ - - if(state->equals_to2_(i1,0).valid == 0){ - - addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); - - res_compare = compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); - - if(res_compare != 1){ - for(k=1; k < state->heapinfo2[i1].busy_block.size; k++) - state->equals_to2_(i1+k,0) = make_heap_area(i1, -1); - for(k=1; k < state->heapinfo1[i1].busy_block.size; k++) - state->equals_to1_(i1+k,0) = make_heap_area(i1, -1); + if (state->heapinfo2[i1].type == state->heapinfo1[i1].type) { + + if (state->equals_to2_(i1, 0).valid == 0) { + + addr_block2 = + ((void *) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); + + res_compare = + compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, + NULL, NULL, 0); + + if (res_compare != 1) { + for (k = 1; k < state->heapinfo2[i1].busy_block.size; k++) + state->equals_to2_(i1 + k, 0) = make_heap_area(i1, -1); + for (k = 1; k < state->heapinfo1[i1].busy_block.size; k++) + state->equals_to1_(i1 + k, 0) = make_heap_area(i1, -1); equal = 1; i1 += state->heapinfo1[i1].busy_block.size; } - + xbt_dynar_reset(previous); - + } - + } - while(i2 <= state->heaplimit && !equal){ + while (i2 <= state->heaplimit && !equal) { + + addr_block2 = + ((void *) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); - addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); - - if(i2 == i1){ + if (i2 == i1) { i2++; continue; } - if(state->heapinfo2[i2].type != 0){ + if (state->heapinfo2[i2].type != 0) { i2++; continue; } - - if(state->equals_to2_(i2,0).valid){ + + if (state->equals_to2_(i2, 0).valid) { i2++; continue; } - - res_compare = compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); - - if(res_compare != 1 ){ - for(k=1; k < state->heapinfo2[i2].busy_block.size; k++) - state->equals_to2_(i2+k,0) = make_heap_area(i1, -1); - for(k=1; k < state->heapinfo1[i1].busy_block.size; k++) - state->equals_to1_(i1+k,0) = make_heap_area(i2, -1); + + res_compare = + compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, + NULL, NULL, 0); + + if (res_compare != 1) { + for (k = 1; k < state->heapinfo2[i2].busy_block.size; k++) + state->equals_to2_(i2 + k, 0) = make_heap_area(i1, -1); + for (k = 1; k < state->heapinfo1[i1].busy_block.size; k++) + state->equals_to1_(i1 + k, 0) = make_heap_area(i2, -1); equal = 1; i1 += state->heapinfo1[i1].busy_block.size; } @@ -484,68 +558,85 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } - if(!equal){ - XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, state->heapinfo1[i1].busy_block.busy_size, addr_block1); + if (!equal) { + XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, + state->heapinfo1[i1].busy_block.busy_size, addr_block1); i1 = state->heaplimit + 1; nb_diff1++; - //i1++; + //i1++; } - - }else{ /* Fragmented block */ - for(j1=0; j1 < (size_t) (BLOCKSIZE >> state->heapinfo1[i1].type); j1++){ + } else { /* Fragmented block */ + + for (j1 = 0; j1 < (size_t) (BLOCKSIZE >> state->heapinfo1[i1].type); j1++) { - if(state->heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ + if (state->heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ continue; - if(state->equals_to1_(i1,j1).valid) + if (state->equals_to1_(i1, j1).valid) continue; - addr_frag1 = (void*) ((char *)addr_block1 + (j1 << state->heapinfo1[i1].type)); + addr_frag1 = + (void *) ((char *) addr_block1 + (j1 << state->heapinfo1[i1].type)); i2 = 1; equal = 0; - + /* Try first to associate to same fragment in the other heap */ - if(state->heapinfo2[i1].type == state->heapinfo1[i1].type){ + if (state->heapinfo2[i1].type == state->heapinfo1[i1].type) { - if(state->equals_to2_(i1,j1).valid == 0){ + if (state->equals_to2_(i1, j1).valid == 0) { - addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); - addr_frag2 = (void*) ((char *)addr_block2 + (j1 << ((xbt_mheap_t)state->s_heap)->heapinfo[i1].type)); + addr_block2 = + ((void *) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); + addr_frag2 = + (void *) ((char *) addr_block2 + + (j1 << ((xbt_mheap_t) state->s_heap)->heapinfo[i1]. + type)); - res_compare = compare_heap_area(addr_frag1, addr_frag2, snapshot1, snapshot2, NULL, NULL, 0); + res_compare = + compare_heap_area(addr_frag1, addr_frag2, snapshot1, snapshot2, + NULL, NULL, 0); - if(res_compare != 1) + if (res_compare != 1) equal = 1; - + xbt_dynar_reset(previous); } } - while(i2 <= state->heaplimit && !equal){ + while (i2 <= state->heaplimit && !equal) { - if(state->heapinfo2[i2].type <= 0){ + if (state->heapinfo2[i2].type <= 0) { i2++; continue; } - for(j2=0; j2 < (size_t) (BLOCKSIZE >> state->heapinfo2[i2].type); j2++){ + for (j2 = 0; j2 < (size_t) (BLOCKSIZE >> state->heapinfo2[i2].type); + j2++) { - if(i2 == i1 && j2 == j1) + if (i2 == i1 && j2 == j1) continue; - - if(state->equals_to2_(i2,j2).valid) + + if (state->equals_to2_(i2, j2).valid) continue; - - addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); - addr_frag2 = (void*) ((char *)addr_block2 + (j2 <<((xbt_mheap_t)state->s_heap)->heapinfo[i2].type)); - res_compare = compare_heap_area(addr_frag1, addr_frag2, snapshot2, snapshot2, NULL, NULL, 0); - - if(res_compare != 1){ + addr_block2 = + ((void *) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); + addr_frag2 = + (void *) ((char *) addr_block2 + + (j2 << ((xbt_mheap_t) state->s_heap)->heapinfo[i2]. + type)); + + res_compare = + compare_heap_area(addr_frag1, addr_frag2, snapshot2, snapshot2, + NULL, NULL, 0); + + if (res_compare != 1) { equal = 1; xbt_dynar_reset(previous); break; @@ -559,8 +650,11 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } - if(!equal){ - XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p)\n", i1, j1, state->heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1); + if (!equal) { + XBT_DEBUG + ("Block %zu, fragment %zu not found (size_used = %zd, address = %p)\n", + i1, j1, state->heapinfo1[i1].busy_frag.frag_size[j1], + addr_frag1); i2 = state->heaplimit + 1; i1 = state->heaplimit + 1; nb_diff1++; @@ -570,23 +664,27 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } i1++; - + } } /* All blocks/fragments are equal to another block/fragment ? */ size_t i = 1, j = 0; - void *real_addr_frag1 = NULL, *real_addr_block1 = NULL, *real_addr_block2 = NULL, *real_addr_frag2 = NULL; - - while(i<=state->heaplimit){ - if(state->heapinfo1[i].type == 0){ - if(i1 == state->heaplimit){ - if(state->heapinfo1[i].busy_block.busy_size > 0){ - if(state->equals_to1_(i,0).valid == 0){ - if(XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)){ - addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1)); - XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block1, state->heapinfo1[i].busy_block.busy_size); + void *real_addr_frag1 = NULL, *real_addr_block1 = NULL, *real_addr_block2 = + NULL, *real_addr_frag2 = NULL; + + while (i <= state->heaplimit) { + if (state->heapinfo1[i].type == 0) { + if (i1 == state->heaplimit) { + if (state->heapinfo1[i].busy_block.busy_size > 0) { + if (state->equals_to1_(i, 0).valid == 0) { + if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { + addr_block1 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase1)); + XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, + addr_block1, state->heapinfo1[i].busy_block.busy_size); //mmalloc_backtrace_block_display((void*)heapinfo1, i); } nb_diff1++; @@ -594,17 +692,29 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } } } - if(state->heapinfo1[i].type > 0){ - addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1)); - real_addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)state->s_heap)->heapbase)); - for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++){ - if(i1== state->heaplimit){ - if(state->heapinfo1[i].busy_frag.frag_size[j] > 0){ - if(state->equals_to1_(i,j).valid == 0){ - if(XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)){ - addr_frag1 = (void*) ((char *)addr_block1 + (j << state->heapinfo1[i].type)); - real_addr_frag1 = (void*) ((char *)real_addr_block1 + (j << ((struct mdesc *)state->s_heap)->heapinfo[i].type)); - XBT_DEBUG("Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag1, real_addr_frag1, state->heapinfo1[i].busy_frag.frag_size[j]); + if (state->heapinfo1[i].type > 0) { + addr_block1 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase1)); + real_addr_block1 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) ((struct mdesc *) state->s_heap)->heapbase)); + for (j = 0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++) { + if (i1 == state->heaplimit) { + if (state->heapinfo1[i].busy_frag.frag_size[j] > 0) { + if (state->equals_to1_(i, j).valid == 0) { + if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { + addr_frag1 = + (void *) ((char *) addr_block1 + + (j << state->heapinfo1[i].type)); + real_addr_frag1 = + (void *) ((char *) real_addr_block1 + + (j << ((struct mdesc *) state->s_heap)-> + heapinfo[i].type)); + XBT_DEBUG + ("Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", + i, j, addr_frag1, real_addr_frag1, + state->heapinfo1[i].busy_frag.frag_size[j]); //mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j); } nb_diff1++; @@ -613,22 +723,25 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } } } - i++; + i++; } - if(i1 == state->heaplimit) + if (i1 == state->heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); i = 1; - while(i<=state->heaplimit){ - if(state->heapinfo2[i].type == 0){ - if(i1 == state->heaplimit){ - if(state->heapinfo2[i].busy_block.busy_size > 0){ - if(state->equals_to2_(i,0).valid == 0){ - if(XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)){ - addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2)); - XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block2, state->heapinfo2[i].busy_block.busy_size); + while (i <= state->heaplimit) { + if (state->heapinfo2[i].type == 0) { + if (i1 == state->heaplimit) { + if (state->heapinfo2[i].busy_block.busy_size > 0) { + if (state->equals_to2_(i, 0).valid == 0) { + if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { + addr_block2 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase2)); + XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, + addr_block2, state->heapinfo2[i].busy_block.busy_size); //mmalloc_backtrace_block_display((void*)heapinfo2, i); } nb_diff2++; @@ -636,17 +749,29 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } } } - if(state->heapinfo2[i].type > 0){ - addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2)); - real_addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)state->s_heap)->heapbase)); - for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo2[i].type); j++){ - if(i1 == state->heaplimit){ - if(state->heapinfo2[i].busy_frag.frag_size[j] > 0){ - if(state->equals_to2_(i,j).valid == 0){ - if(XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)){ - addr_frag2 = (void*) ((char *)addr_block2 + (j << state->heapinfo2[i].type)); - real_addr_frag2 = (void*) ((char *)real_addr_block2 + (j << ((struct mdesc *)state->s_heap)->heapinfo[i].type)); - XBT_DEBUG( "Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag2, real_addr_frag2, state->heapinfo2[i].busy_frag.frag_size[j]); + if (state->heapinfo2[i].type > 0) { + addr_block2 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase2)); + real_addr_block2 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) ((struct mdesc *) state->s_heap)->heapbase)); + for (j = 0; j < (size_t) (BLOCKSIZE >> state->heapinfo2[i].type); j++) { + if (i1 == state->heaplimit) { + if (state->heapinfo2[i].busy_frag.frag_size[j] > 0) { + if (state->equals_to2_(i, j).valid == 0) { + if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { + addr_frag2 = + (void *) ((char *) addr_block2 + + (j << state->heapinfo2[i].type)); + real_addr_frag2 = + (void *) ((char *) real_addr_block2 + + (j << ((struct mdesc *) state->s_heap)-> + heapinfo[i].type)); + XBT_DEBUG + ("Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", + i, j, addr_frag2, real_addr_frag2, + state->heapinfo2[i].busy_frag.frag_size[j]); //mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j); } nb_diff2++; @@ -655,14 +780,15 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m } } } - i++; + i++; } - if(i1 == state->heaplimit) + if (i1 == state->heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); xbt_dynar_free(&previous); - real_addr_frag1 = NULL, real_addr_block1 = NULL, real_addr_block2 = NULL, real_addr_frag2 = NULL; + real_addr_frag1 = NULL, real_addr_block1 = NULL, real_addr_block2 = + NULL, real_addr_frag2 = NULL; return ((nb_diff1 > 0) || (nb_diff2 > 0)); } @@ -680,22 +806,33 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_m * @param size * @param check_ignore */ -static int compare_heap_area_without_type(struct s_mc_diff *state, void *real_area1, void *real_area2, void *area1, void *area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, int size, int check_ignore){ +static int compare_heap_area_without_type(struct s_mc_diff *state, + void *real_area1, void *real_area2, + void *area1, void *area2, + mc_snapshot_t snapshot1, + mc_snapshot_t snapshot2, + xbt_dynar_t previous, int size, + int check_ignore) +{ int i = 0; void *addr_pointed1, *addr_pointed2; int pointer_align, res_compare; ssize_t ignore1, ignore2; - while(i 0){ - if((ignore1 = heap_comparison_ignore_size(state->to_ignore1, (char *)real_area1 + i)) != -1){ - if((ignore2 = heap_comparison_ignore_size(state->to_ignore2, (char *)real_area2 + i)) == ignore1){ - if(ignore1 == 0){ + if (check_ignore > 0) { + if ((ignore1 = + heap_comparison_ignore_size(state->to_ignore1, + (char *) real_area1 + i)) != -1) { + if ((ignore2 = + heap_comparison_ignore_size(state->to_ignore2, + (char *) real_area2 + i)) == ignore1) { + if (ignore1 == 0) { check_ignore--; return 0; - }else{ + } else { i = i + ignore2; check_ignore--; continue; @@ -704,36 +841,43 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, void *real_ar } } - if(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){ + if (memcmp(((char *) area1) + i, ((char *) area2) + i, 1) != 0) { + + pointer_align = (i / sizeof(void *)) * sizeof(void *); + addr_pointed1 = *((void **) ((char *) area1 + pointer_align)); + addr_pointed2 = *((void **) ((char *) area2 + pointer_align)); - pointer_align = (i / sizeof(void*)) * sizeof(void*); - addr_pointed1 = *((void **)((char *)area1 + pointer_align)); - addr_pointed2 = *((void **)((char *)area2 + pointer_align)); - - if(addr_pointed1 > maestro_stack_start && addr_pointed1 < maestro_stack_end && addr_pointed2 > maestro_stack_start && addr_pointed2 < maestro_stack_end){ + if (addr_pointed1 > maestro_stack_start + && addr_pointed1 < maestro_stack_end + && addr_pointed2 > maestro_stack_start + && addr_pointed2 < maestro_stack_end) { i = pointer_align + sizeof(void *); continue; - }else if(addr_pointed1 > state->s_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->s_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)){ + } else if (addr_pointed1 > state->s_heap + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->s_heap + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) { // Both addreses are in the heap: - res_compare = compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, NULL, 0); - if(res_compare == 1){ + res_compare = + compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + snapshot2, previous, NULL, 0); + if (res_compare == 1) { return res_compare; } i = pointer_align + sizeof(void *); continue; - }else{ + } else { return 1; } - + } - + i++; } return 0; - + } /** @@ -752,46 +896,55 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, void *real_ar * @param pointer_level * @return 0 (same), 1 (different), -1 (unknown) */ -static int compare_heap_area_with_type(struct s_mc_diff *state, void *real_area1, void *real_area2, void *area1, void *area2, - mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, +static int compare_heap_area_with_type(struct s_mc_diff *state, + void *real_area1, void *real_area2, + void *area1, void *area2, + mc_snapshot_t snapshot1, + mc_snapshot_t snapshot2, xbt_dynar_t previous, dw_type_t type, - int area_size, int check_ignore, int pointer_level){ + int area_size, int check_ignore, + int pointer_level) +{ - if(is_stack(real_area1) && is_stack(real_area2)) + if (is_stack(real_area1) && is_stack(real_area2)) return 0; ssize_t ignore1, ignore2; - if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(state->to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(state->to_ignore2, real_area2)) == ignore1)){ + if ((check_ignore > 0) + && ((ignore1 = heap_comparison_ignore_size(state->to_ignore1, real_area1)) + > 0) + && ((ignore2 = heap_comparison_ignore_size(state->to_ignore2, real_area2)) + == ignore1)) { return 0; } - + dw_type_t subtype, subsubtype; int res, elm_size, i; unsigned int cursor = 0; dw_type_t member; void *addr_pointed1, *addr_pointed2;; - switch(type->type){ + switch (type->type) { case DW_TAG_unspecified_type: return 1; case DW_TAG_base_type: - if(type->name!=NULL && strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */ - if(real_area1 == real_area2) + if (type->name != NULL && strcmp(type->name, "char") == 0) { /* String, hence random (arbitrary ?) size */ + if (real_area1 == real_area2) return -1; else return (memcmp(area1, area2, area_size) != 0); - }else{ - if(area_size != -1 && type->byte_size != area_size) + } else { + if (area_size != -1 && type->byte_size != area_size) return -1; - else{ - return (memcmp(area1, area2, type->byte_size) != 0); + else { + return (memcmp(area1, area2, type->byte_size) != 0); } } break; case DW_TAG_enumeration_type: - if(area_size != -1 && type->byte_size != area_size) + if (area_size != -1 && type->byte_size != area_size) return -1; else return (memcmp(area1, area2, type->byte_size) != 0); @@ -799,11 +952,14 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, void *real_area1 case DW_TAG_typedef: case DW_TAG_const_type: case DW_TAG_volatile_type: - return compare_heap_area_with_type(state, real_area1, real_area2, area1, area2, snapshot1, snapshot2, previous, type->subtype, area_size, check_ignore, pointer_level); + return compare_heap_area_with_type(state, real_area1, real_area2, area1, + area2, snapshot1, snapshot2, previous, + type->subtype, area_size, check_ignore, + pointer_level); break; case DW_TAG_array_type: subtype = type->subtype; - switch(subtype->type){ + switch (subtype->type) { case DW_TAG_unspecified_type: return 1; @@ -815,93 +971,131 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, void *real_area1 case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: - if(subtype->full_type) + if (subtype->full_type) subtype = subtype->full_type; elm_size = subtype->byte_size; break; - // TODO, just remove the type indirection? + // TODO, just remove the type indirection? case DW_TAG_const_type: case DW_TAG_typedef: case DW_TAG_volatile_type: subsubtype = subtype->subtype; - if(subsubtype->full_type) + if (subsubtype->full_type) subsubtype = subsubtype->full_type; elm_size = subsubtype->byte_size; break; - default : + default: return 0; break; } - for(i=0; ielement_count; i++){ + for (i = 0; i < type->element_count; i++) { // TODO, add support for variable stride (DW_AT_byte_stride) - res = compare_heap_area_with_type(state, (char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), snapshot1, snapshot2, previous, type->subtype, subtype->byte_size, check_ignore, pointer_level); - if(res == 1) + res = + compare_heap_area_with_type(state, + (char *) real_area1 + (i * elm_size), + (char *) real_area2 + (i * elm_size), + (char *) area1 + (i * elm_size), + (char *) area2 + (i * elm_size), + snapshot1, snapshot2, previous, + type->subtype, subtype->byte_size, + check_ignore, pointer_level); + if (res == 1) return res; } break; case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: case DW_TAG_pointer_type: - if(type->subtype && type->subtype->type == DW_TAG_subroutine_type){ - addr_pointed1 = *((void **)(area1)); - addr_pointed2 = *((void **)(area2)); + if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { + addr_pointed1 = *((void **) (area1)); + addr_pointed2 = *((void **) (area2)); return (addr_pointed1 != addr_pointed2);; - }else{ + } else { pointer_level++; - if(pointer_level > 1){ /* Array of pointers */ - for(i=0; i<(area_size/sizeof(void *)); i++){ - addr_pointed1 = *((void **)((char *)area1 + (i*sizeof(void *)))); - addr_pointed2 = *((void **)((char *)area2 + (i*sizeof(void *)))); - if(addr_pointed1 > state->s_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->s_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - res = compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, pointer_level); + if (pointer_level > 1) { /* Array of pointers */ + for (i = 0; i < (area_size / sizeof(void *)); i++) { + addr_pointed1 = *((void **) ((char *) area1 + (i * sizeof(void *)))); + addr_pointed2 = *((void **) ((char *) area2 + (i * sizeof(void *)))); + if (addr_pointed1 > state->s_heap + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->s_heap + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) + res = + compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + snapshot2, previous, type->subtype, + pointer_level); else - res = (addr_pointed1 != addr_pointed2); - if(res == 1) + res = (addr_pointed1 != addr_pointed2); + if (res == 1) return res; } - }else{ - addr_pointed1 = *((void **)(area1)); - addr_pointed2 = *((void **)(area2)); - if(addr_pointed1 > state->s_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->s_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, pointer_level); + } else { + addr_pointed1 = *((void **) (area1)); + addr_pointed2 = *((void **) (area2)); + if (addr_pointed1 > state->s_heap + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->s_heap + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) + return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + snapshot2, previous, type->subtype, + pointer_level); else - return (addr_pointed1 != addr_pointed2); + return (addr_pointed1 != addr_pointed2); } } break; case DW_TAG_structure_type: case DW_TAG_class_type: - if(type->full_type) + if (type->full_type) type = type->full_type; - if(area_size != -1 && type->byte_size != area_size){ - if(area_size>type->byte_size && area_size%type->byte_size == 0){ - for(i=0; i<(area_size/type->byte_size); i++){ - res = compare_heap_area_with_type(state, (char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), snapshot1, snapshot2, previous, type, -1, check_ignore, 0); - if(res == 1) + if (area_size != -1 && type->byte_size != area_size) { + if (area_size > type->byte_size && area_size % type->byte_size == 0) { + for (i = 0; i < (area_size / type->byte_size); i++) { + res = + compare_heap_area_with_type(state, + (char *) real_area1 + + (i * type->byte_size), + (char *) real_area2 + + (i * type->byte_size), + (char *) area1 + + (i * type->byte_size), + (char *) area2 + + (i * type->byte_size), snapshot1, + snapshot2, previous, type, -1, + check_ignore, 0); + if (res == 1) return res; } - }else{ + } else { return -1; } - }else{ + } else { cursor = 0; - xbt_dynar_foreach(type->members, cursor, member){ + xbt_dynar_foreach(type->members, cursor, member) { // TODO, optimize this? (for the offset case) - char* real_member1 = mc_member_resolve(real_area1, type, member, snapshot1); - char* real_member2 = mc_member_resolve(real_area2, type, member, snapshot2); - char* member1 = mc_translate_address((uintptr_t)real_member1, snapshot1); - char* member2 = mc_translate_address((uintptr_t)real_member2, snapshot2); - res = compare_heap_area_with_type(state, real_member1, real_member2, member1, member2, snapshot1, snapshot2, previous, member->subtype, -1, check_ignore, 0); - if(res == 1){ + char *real_member1 = + mc_member_resolve(real_area1, type, member, snapshot1); + char *real_member2 = + mc_member_resolve(real_area2, type, member, snapshot2); + char *member1 = + mc_translate_address((uintptr_t) real_member1, snapshot1); + char *member2 = + mc_translate_address((uintptr_t) real_member2, snapshot2); + res = + compare_heap_area_with_type(state, real_member1, real_member2, + member1, member2, snapshot1, snapshot2, + previous, member->subtype, -1, + check_ignore, 0); + if (res == 1) { return res; } } } break; case DW_TAG_union_type: - return compare_heap_area_without_type(state, real_area1, real_area2, area1, area2, snapshot1, snapshot2, previous, type->byte_size, check_ignore); + return compare_heap_area_without_type(state, real_area1, real_area2, area1, + area2, snapshot1, snapshot2, previous, + type->byte_size, check_ignore); break; default: break; @@ -921,35 +1115,39 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, void *real_area1 * @param area_size * @return DWARF type ID for given offset */ -static dw_type_t get_offset_type(void* real_base_address, dw_type_t type, int offset, int area_size, mc_snapshot_t snapshot){ +static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, + int offset, int area_size, + mc_snapshot_t snapshot) +{ // Beginning of the block, the infered variable type if the type of the block: - if(offset==0) + if (offset == 0) return type; - switch(type->type){ - case DW_TAG_structure_type : + switch (type->type) { + case DW_TAG_structure_type: case DW_TAG_class_type: - if(type->full_type) + if (type->full_type) type = type->full_type; - - if(area_size != -1 && type->byte_size != area_size){ - if(area_size>type->byte_size && area_size%type->byte_size == 0) + + if (area_size != -1 && type->byte_size != area_size) { + if (area_size > type->byte_size && area_size % type->byte_size == 0) return type; else return NULL; - }else{ + } else { unsigned int cursor = 0; dw_type_t member; - xbt_dynar_foreach(type->members, cursor, member){ + xbt_dynar_foreach(type->members, cursor, member) { - if(!member->location.size) { + if (!member->location.size) { // We have the offset, use it directly (shortcut): - if(member->offset == offset) + if (member->offset == offset) return member->subtype; } else { - char* real_member = mc_member_resolve(real_base_address, type, member, snapshot); - if(real_member - (char*)real_base_address == offset) + char *real_member = + mc_member_resolve(real_base_address, type, member, snapshot); + if (real_member - (char *) real_base_address == offset) return member->subtype; } @@ -975,92 +1173,111 @@ static dw_type_t get_offset_type(void* real_base_address, dw_type_t type, int of * @param pointer_level * @return 0 (same), 1 (different), -1 */ -int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, dw_type_t type, int pointer_level){ +int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, + mc_snapshot_t snapshot2, xbt_dynar_t previous, + dw_type_t type, int pointer_level) +{ - struct s_mc_diff* state = mc_diff_info; + struct s_mc_diff *state = mc_diff_info; int res_compare; ssize_t block1, frag1, block2, frag2; ssize_t size; int check_ignore = 0; - void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, + *real_addr_block2, *real_addr_frag1, *real_addr_frag2; void *area1_to_compare, *area2_to_compare; int type_size = -1; - int offset1 =0, offset2 = 0; + int offset1 = 0, offset2 = 0; int new_size1 = -1, new_size2 = -1; dw_type_t new_type1 = NULL, new_type2 = NULL; int match_pairs = 0; - if(previous == NULL){ - previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); + if (previous == NULL) { + previous = + xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); match_pairs = 1; } - // Get block number: - block1 = ((char*)area1 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1; - block2 = ((char*)area2 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1; + block1 = + ((char *) area1 - + (char *) ((xbt_mheap_t) state->s_heap)->heapbase) / BLOCKSIZE + 1; + block2 = + ((char *) area2 - + (char *) ((xbt_mheap_t) state->s_heap)->heapbase) / BLOCKSIZE + 1; // If either block is a stack block: - if(is_block_stack((int)block1) && is_block_stack((int)block2)){ + if (is_block_stack((int) block1) && is_block_stack((int) block2)) { add_heap_area_pair(previous, block1, -1, block2, -1); - if(match_pairs){ + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; } - // If either block is not in the expected area of memory: - if(((char *)area1 < (char*)((xbt_mheap_t)state->s_heap)->heapbase) || (block1 > state->heapsize1) || (block1 < 1) - || ((char *)area2 < (char*)((xbt_mheap_t)state->s_heap)->heapbase) || (block2 > state->heapsize2) || (block2 < 1)){ - if(match_pairs){ + if (((char *) area1 < (char *) ((xbt_mheap_t) state->s_heap)->heapbase) + || (block1 > state->heapsize1) || (block1 < 1) + || ((char *) area2 < (char *) ((xbt_mheap_t) state->s_heap)->heapbase) + || (block2 > state->heapsize2) || (block2 < 1)) { + if (match_pairs) { xbt_dynar_free(&previous); } return 1; } - // Snapshot address of the block: - addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)state->heapbase1)); - addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)state->heapbase2)); + addr_block1 = + ((void *) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + + (char *) state->heapbase1)); + addr_block2 = + ((void *) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + + (char *) state->heapbase2)); // Process address of the block: - real_addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); - real_addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase)); + real_addr_block1 = + ((void *) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); + real_addr_block2 = + ((void *) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); - if(type){ + if (type) { - if(type->full_type) + if (type->full_type) type = type->full_type; // This assume that for "boring" types (volatile ...) byte_size is absent: - while(type->byte_size == 0 && type->subtype!=NULL) + while (type->byte_size == 0 && type->subtype != NULL) type = type->subtype; // Find type_size: - if((type->type == DW_TAG_pointer_type) || ((type->type == DW_TAG_base_type) && type->name!=NULL && (!strcmp(type->name, "char")))) + if ((type->type == DW_TAG_pointer_type) + || ((type->type == DW_TAG_base_type) && type->name != NULL + && (!strcmp(type->name, "char")))) type_size = -1; else type_size = type->byte_size; } - - if((state->heapinfo1[block1].type == -1) && (state->heapinfo2[block2].type == -1)){ /* Free block */ - if(match_pairs){ + if ((state->heapinfo1[block1].type == -1) && (state->heapinfo2[block2].type == -1)) { /* Free block */ + + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; - }else if((state->heapinfo1[block1].type == 0) && (state->heapinfo2[block2].type == 0)){ /* Complete block */ - + } else if ((state->heapinfo1[block1].type == 0) && (state->heapinfo2[block2].type == 0)) { /* Complete block */ + // TODO, lookup variable type from block type as done for fragmented blocks - if(state->equals_to1_(block1,0).valid && state->equals_to2_(block2,0).valid){ - if(equal_blocks(state, block1, block2)){ - if(match_pairs){ + if (state->equals_to1_(block1, 0).valid + && state->equals_to2_(block2, 0).valid) { + if (equal_blocks(state, block1, block2)) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1068,11 +1285,11 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap } } - if(type_size != -1){ - if(type_size != state->heapinfo1[block1].busy_block.busy_size - && type_size != state->heapinfo2[block2].busy_block.busy_size - && type->name!=NULL && !strcmp(type->name, "s_smx_context")){ - if(match_pairs){ + if (type_size != -1) { + if (type_size != state->heapinfo1[block1].busy_block.busy_size + && type_size != state->heapinfo2[block2].busy_block.busy_size + && type->name != NULL && !strcmp(type->name, "s_smx_context")) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1080,41 +1297,43 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap } } - if(state->heapinfo1[block1].busy_block.size != state->heapinfo2[block2].busy_block.size){ - if(match_pairs){ + if (state->heapinfo1[block1].busy_block.size != + state->heapinfo2[block2].busy_block.size) { + if (match_pairs) { xbt_dynar_free(&previous); } return 1; } - if(state->heapinfo1[block1].busy_block.busy_size != state->heapinfo2[block2].busy_block.busy_size){ - if(match_pairs){ + if (state->heapinfo1[block1].busy_block.busy_size != + state->heapinfo2[block2].busy_block.busy_size) { + if (match_pairs) { xbt_dynar_free(&previous); } return 1; } - if(!add_heap_area_pair(previous, block1, -1, block2, -1)){ - if(match_pairs){ + if (!add_heap_area_pair(previous, block1, -1, block2, -1)) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; } - + size = state->heapinfo1[block1].busy_block.busy_size; - + // Remember (basic) type inference. // The current data structure only allows us to do this for the whole block. - if (type != NULL && area1==real_addr_block1) { - state->types1_(block1,0) = type; + if (type != NULL && area1 == real_addr_block1) { + state->types1_(block1, 0) = type; } - if (type != NULL && area2==real_addr_block2) { - state->types2_(block2,0) = type; + if (type != NULL && area2 == real_addr_block2) { + state->types2_(block2, 0) = type; } - if(size <= 0){ - if(match_pairs){ + if (size <= 0) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1127,123 +1346,152 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap area1_to_compare = addr_block1; area2_to_compare = addr_block2; - if((state->heapinfo1[block1].busy_block.ignore > 0) && (state->heapinfo2[block2].busy_block.ignore == state->heapinfo1[block1].busy_block.ignore)) + if ((state->heapinfo1[block1].busy_block.ignore > 0) + && (state->heapinfo2[block2].busy_block.ignore == + state->heapinfo1[block1].busy_block.ignore)) check_ignore = state->heapinfo1[block1].busy_block.ignore; - - }else if((state->heapinfo1[block1].type > 0) && (state->heapinfo2[block2].type > 0)){ /* Fragmented block */ + + } else if ((state->heapinfo1[block1].type > 0) && (state->heapinfo2[block2].type > 0)) { /* Fragmented block */ // Fragment number: - frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> state->heapinfo1[block1].type; - frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> state->heapinfo2[block2].type; + frag1 = + ((uintptr_t) (ADDR2UINT(area1) % (BLOCKSIZE))) >> state-> + heapinfo1[block1].type; + frag2 = + ((uintptr_t) (ADDR2UINT(area2) % (BLOCKSIZE))) >> state-> + heapinfo2[block2].type; // Snapshot address of the fragment: - addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << state->heapinfo1[block1].type)); - addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << state->heapinfo2[block2].type)); + addr_frag1 = + (void *) ((char *) addr_block1 + + (frag1 << state->heapinfo1[block1].type)); + addr_frag2 = + (void *) ((char *) addr_block2 + + (frag2 << state->heapinfo2[block2].type)); // Process address of the fragment: - real_addr_frag1 = (void*) ((char *)real_addr_block1 + (frag1 << ((xbt_mheap_t)state->s_heap)->heapinfo[block1].type)); - real_addr_frag2 = (void*) ((char *)real_addr_block2 + (frag2 << ((xbt_mheap_t)state->s_heap)->heapinfo[block2].type)); + real_addr_frag1 = + (void *) ((char *) real_addr_block1 + + (frag1 << ((xbt_mheap_t) state->s_heap)->heapinfo[block1]. + type)); + real_addr_frag2 = + (void *) ((char *) real_addr_block2 + + (frag2 << ((xbt_mheap_t) state->s_heap)->heapinfo[block2]. + type)); // Check the size of the fragments against the size of the type: - if(type_size != -1){ - if(state->heapinfo1[block1].busy_frag.frag_size[frag1] == -1 || state->heapinfo2[block2].busy_frag.frag_size[frag2] == -1){ - if(match_pairs){ + if (type_size != -1) { + if (state->heapinfo1[block1].busy_frag.frag_size[frag1] == -1 + || state->heapinfo2[block2].busy_frag.frag_size[frag2] == -1) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return -1; } - if(type_size != state->heapinfo1[block1].busy_frag.frag_size[frag1]|| type_size != state->heapinfo2[block2].busy_frag.frag_size[frag2]){ - if(match_pairs){ + if (type_size != state->heapinfo1[block1].busy_frag.frag_size[frag1] + || type_size != state->heapinfo2[block2].busy_frag.frag_size[frag2]) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return -1; } } - // Check if the blocks are already matched together: - if(state->equals_to1_(block1,frag1).valid && state->equals_to2_(block2,frag2).valid){ - if(equal_fragments(state, block1, frag1, block2, frag2)){ - if(match_pairs){ + if (state->equals_to1_(block1, frag1).valid + && state->equals_to2_(block2, frag2).valid) { + if (equal_fragments(state, block1, frag1, block2, frag2)) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; } } - // Compare the size of both fragments: - if(state->heapinfo1[block1].busy_frag.frag_size[frag1] != state->heapinfo2[block2].busy_frag.frag_size[frag2]){ - if(type_size == -1){ - if(match_pairs){ + if (state->heapinfo1[block1].busy_frag.frag_size[frag1] != + state->heapinfo2[block2].busy_frag.frag_size[frag2]) { + if (type_size == -1) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return -1; - }else{ - if(match_pairs){ + } else { + if (match_pairs) { xbt_dynar_free(&previous); } return 1; } } - // Size of the fragment: size = state->heapinfo1[block1].busy_frag.frag_size[frag1]; // Remember (basic) type inference. // The current data structure only allows us to do this for the whole block. - if(type != NULL && area1==real_addr_frag1){ - state->types1_(block1,frag1) = type; + if (type != NULL && area1 == real_addr_frag1) { + state->types1_(block1, frag1) = type; } - if(type != NULL && area2==real_addr_frag2) { - state->types2_(block2,frag2) = type; + if (type != NULL && area2 == real_addr_frag2) { + state->types2_(block2, frag2) = type; } - // The type of the variable is already known: - if(type) { + if (type) { new_type1 = type; new_type2 = type; } - // Type inference from the block type. - else if(state->types1_(block1,frag1) != NULL || state->types2_(block2,frag2) != NULL) { - - offset1 = (char *)area1 - (char *)real_addr_frag1; - offset2 = (char *)area2 - (char *)real_addr_frag2; - - if(state->types1_(block1,frag1) != NULL && state->types2_(block2,frag2) != NULL){ - new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1,frag1), offset1, size, snapshot1); - new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2,frag2), offset1, size, snapshot2); - }else if(state->types1_(block1,frag1) != NULL){ - new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1,frag1), offset1, size, snapshot1); - new_type2 = get_offset_type(real_addr_frag2, state->types1_(block1,frag1), offset2, size, snapshot2); - }else if(state->types2_(block2,frag2) != NULL){ - new_type1 = get_offset_type(real_addr_frag1, state->types2_(block2,frag2), offset1, size, snapshot1); - new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2,frag2), offset2, size, snapshot2); - }else{ - if(match_pairs){ + else if (state->types1_(block1, frag1) != NULL + || state->types2_(block2, frag2) != NULL) { + + offset1 = (char *) area1 - (char *) real_addr_frag1; + offset2 = (char *) area2 - (char *) real_addr_frag2; + + if (state->types1_(block1, frag1) != NULL + && state->types2_(block2, frag2) != NULL) { + new_type1 = + get_offset_type(real_addr_frag1, state->types1_(block1, frag1), + offset1, size, snapshot1); + new_type2 = + get_offset_type(real_addr_frag2, state->types2_(block2, frag2), + offset1, size, snapshot2); + } else if (state->types1_(block1, frag1) != NULL) { + new_type1 = + get_offset_type(real_addr_frag1, state->types1_(block1, frag1), + offset1, size, snapshot1); + new_type2 = + get_offset_type(real_addr_frag2, state->types1_(block1, frag1), + offset2, size, snapshot2); + } else if (state->types2_(block2, frag2) != NULL) { + new_type1 = + get_offset_type(real_addr_frag1, state->types2_(block2, frag2), + offset1, size, snapshot1); + new_type2 = + get_offset_type(real_addr_frag2, state->types2_(block2, frag2), + offset2, size, snapshot2); + } else { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return -1; - } + } - if(new_type1 != NULL && new_type2 != NULL && new_type1!=new_type2){ + if (new_type1 != NULL && new_type2 != NULL && new_type1 != new_type2) { - type = new_type1; - while(type->byte_size == 0 && type->subtype != NULL) - type = type->subtype; - new_size1 = type->byte_size; + type = new_type1; + while (type->byte_size == 0 && type->subtype != NULL) + type = type->subtype; + new_size1 = type->byte_size; - type = new_type2; - while(type->byte_size == 0 && type->subtype != NULL) - type = type->subtype; - new_size2 = type->byte_size; + type = new_type2; + while (type->byte_size == 0 && type->subtype != NULL) + type = type->subtype; + new_size2 = type->byte_size; - }else{ - if(match_pairs){ + } else { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1251,17 +1499,17 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap } } - area1_to_compare = (char *)addr_frag1 + offset1; - area2_to_compare = (char *)addr_frag2 + offset2; - - if(new_size1 > 0 && new_size1 == new_size2){ + area1_to_compare = (char *) addr_frag1 + offset1; + area2_to_compare = (char *) addr_frag2 + offset2; + + if (new_size1 > 0 && new_size1 == new_size2) { type = new_type1; size = new_size1; } - if(offset1 == 0 && offset2 == 0){ - if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ - if(match_pairs){ + if (offset1 == 0 && offset2 == 0) { + if (!add_heap_area_pair(previous, block1, frag1, block2, frag2)) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1269,40 +1517,49 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap } } - if(size <= 0){ - if(match_pairs){ + if (size <= 0) { + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; } - - if((state->heapinfo1[block1].busy_frag.ignore[frag1] > 0) && ( state->heapinfo2[block2].busy_frag.ignore[frag2] == state->heapinfo1[block1].busy_frag.ignore[frag1])) + + if ((state->heapinfo1[block1].busy_frag.ignore[frag1] > 0) + && (state->heapinfo2[block2].busy_frag.ignore[frag2] == + state->heapinfo1[block1].busy_frag.ignore[frag1])) check_ignore = state->heapinfo1[block1].busy_frag.ignore[frag1]; - - }else{ - if(match_pairs){ + } else { + + if (match_pairs) { xbt_dynar_free(&previous); } return 1; } - - /* Start comparison*/ - if(type){ - res_compare = compare_heap_area_with_type(state, area1, area2, area1_to_compare, area2_to_compare, snapshot1, snapshot2, previous, type, size, check_ignore, pointer_level); - }else{ - res_compare = compare_heap_area_without_type(state, area1, area2, area1_to_compare, area2_to_compare, snapshot1, snapshot2, previous, size, check_ignore); + + /* Start comparison */ + if (type) { + res_compare = + compare_heap_area_with_type(state, area1, area2, area1_to_compare, + area2_to_compare, snapshot1, snapshot2, + previous, type, size, check_ignore, + pointer_level); + } else { + res_compare = + compare_heap_area_without_type(state, area1, area2, area1_to_compare, + area2_to_compare, snapshot1, snapshot2, + previous, size, check_ignore); } - if(res_compare == 1){ - if(match_pairs) + if (res_compare == 1) { + if (match_pairs) xbt_dynar_free(&previous); return res_compare; } - if(match_pairs){ + if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } @@ -1314,43 +1571,50 @@ int compare_heap_area(void *area1, void* area2, mc_snapshot_t snapshot1, mc_snap /****************************************************************************************************************/ // Not used: -static int get_pointed_area_size(void *area, int heap){ +static int get_pointed_area_size(void *area, int heap) +{ struct s_mc_diff *state = mc_diff_info; int block, frag; malloc_info *heapinfo; - if(heap == 1) + if (heap == 1) heapinfo = state->heapinfo1; else heapinfo = state->heapinfo2; - block = ((char*)area - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1; + block = + ((char *) area - + (char *) ((xbt_mheap_t) state->s_heap)->heapbase) / BLOCKSIZE + 1; - if(((char *)area < (char*)((xbt_mheap_t)state->s_heap)->heapbase) || (block > state->heapsize1) || (block < 1)) + if (((char *) area < (char *) ((xbt_mheap_t) state->s_heap)->heapbase) + || (block > state->heapsize1) || (block < 1)) return -1; - if(heapinfo[block].type == -1){ /* Free block */ - return -1; - }else if(heapinfo[block].type == 0){ /* Complete block */ - return (int)heapinfo[block].busy_block.busy_size; - }else{ - frag = ((uintptr_t) (ADDR2UINT (area) % (BLOCKSIZE))) >> heapinfo[block].type; - return (int)heapinfo[block].busy_frag.frag_size[frag]; + if (heapinfo[block].type == -1) { /* Free block */ + return -1; + } else if (heapinfo[block].type == 0) { /* Complete block */ + return (int) heapinfo[block].busy_block.busy_size; + } else { + frag = + ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type; + return (int) heapinfo[block].busy_frag.frag_size[frag]; } } // Not used: -char *get_type_description(mc_object_info_t info, char *type_name){ +char *get_type_description(mc_object_info_t info, char *type_name) +{ xbt_dict_cursor_t dict_cursor; char *type_origin; dw_type_t type; - xbt_dict_foreach(info->types, dict_cursor, type_origin, type){ - if(type->name && (strcmp(type->name, type_name) == 0) && type->byte_size > 0){ + xbt_dict_foreach(info->types, dict_cursor, type_origin, type) { + if (type->name && (strcmp(type->name, type_name) == 0) + && type->byte_size > 0) { xbt_dict_cursor_free(&dict_cursor); return type_origin; } @@ -1366,32 +1630,40 @@ char *get_type_description(mc_object_info_t info, char *type_name){ #endif // Not used: -int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ +int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) +{ struct s_mc_diff *state = mc_diff_info; - if(heap1 == NULL && heap1 == NULL){ + if (heap1 == NULL && heap1 == NULL) { XBT_DEBUG("Malloc descriptors null"); return 0; } - if(heap1->heaplimit != heap2->heaplimit){ + if (heap1->heaplimit != heap2->heaplimit) { XBT_DEBUG("Different limit of valid info table indices"); return 1; } /* Heap information */ - state->heaplimit = ((struct mdesc *)heap1)->heaplimit; + state->heaplimit = ((struct mdesc *) heap1)->heaplimit; // Mamailloute in order to find the base address of the main heap: - state->s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - xbt_pagesize; + state->s_heap = + (char *) mmalloc_get_current_heap() - STD_HEAP_SIZE - xbt_pagesize; - state->heapbase1 = (char *)heap1 + BLOCKSIZE; - state->heapbase2 = (char *)heap2 + BLOCKSIZE; + state->heapbase1 = (char *) heap1 + BLOCKSIZE; + state->heapbase2 = (char *) heap2 + BLOCKSIZE; - state->heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)heap1->heapinfo - (char *)state->s_heap))); - state->heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)heap2->heapinfo - (char *)state->s_heap))); + state->heapinfo1 = + (malloc_info *) ((char *) heap1 + + ((uintptr_t) + ((char *) heap1->heapinfo - (char *) state->s_heap))); + state->heapinfo2 = + (malloc_info *) ((char *) heap2 + + ((uintptr_t) + ((char *) heap2->heapinfo - (char *) state->s_heap))); state->heapsize1 = heap1->heapsize; state->heapsize2 = heap2->heapsize; @@ -1402,80 +1674,97 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ int distance = 0; - /* Check busy blocks*/ + /* Check busy blocks */ i = 1; - while(i <= state->heaplimit){ + while (i <= state->heaplimit) { - addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1)); - addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2)); + addr_block1 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase1)); + addr_block2 = + ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + + (char *) state->heapbase2)); + + if (state->heapinfo1[i].type != state->heapinfo2[i].type) { - if(state->heapinfo1[i].type != state->heapinfo2[i].type){ - distance += BLOCKSIZE; - XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, state->heapinfo1[i].type, state->heapinfo2[i].type, distance); + XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, + state->heapinfo1[i].type, state->heapinfo2[i].type, distance); i++; - - }else{ - if(state->heapinfo1[i].type == -1){ /* Free block */ + } else { + + if (state->heapinfo1[i].type == -1) { /* Free block */ i++; continue; } - if(state->heapinfo1[i].type == 0){ /* Large block */ - - if(state->heapinfo1[i].busy_block.size != state->heapinfo2[i].busy_block.size){ - distance += BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size); - i += max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size); - XBT_DEBUG("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", i, state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size, distance); + if (state->heapinfo1[i].type == 0) { /* Large block */ + + if (state->heapinfo1[i].busy_block.size != + state->heapinfo2[i].busy_block.size) { + distance += + BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, + state->heapinfo2[i].busy_block.size); + i += max(state->heapinfo1[i].busy_block.size, + state->heapinfo2[i].busy_block.size); + XBT_DEBUG + ("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", + i, state->heapinfo1[i].busy_block.size, + state->heapinfo2[i].busy_block.size, distance); continue; } /*if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){ - distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size); - i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); - XBT_DEBUG("Different size used oin large cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size, distance); - continue; - }*/ + distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size); + i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); + XBT_DEBUG("Different size used oin large cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size, distance); + continue; + } */ k = 0; //while(k < (heapinfo1[i].busy_block.busy_size)){ - while(k < state->heapinfo1[i].busy_block.size * BLOCKSIZE){ - if(memcmp((char *)addr_block1 + k, (char *)addr_block2 + k, 1) != 0){ - distance ++; + while (k < state->heapinfo1[i].busy_block.size * BLOCKSIZE) { + if (memcmp((char *) addr_block1 + k, (char *) addr_block2 + k, 1) != + 0) { + distance++; } k++; - } + } i++; - }else { /* Fragmented block */ + } else { /* Fragmented block */ - for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++){ + for (j = 0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++) { - addr_frag1 = (void*) ((char *)addr_block1 + (j << state->heapinfo1[i].type)); - addr_frag2 = (void*) ((char *)addr_block2 + (j << state->heapinfo2[i].type)); + addr_frag1 = + (void *) ((char *) addr_block1 + (j << state->heapinfo1[i].type)); + addr_frag2 = + (void *) ((char *) addr_block2 + (j << state->heapinfo2[i].type)); - if(state->heapinfo1[i].busy_frag.frag_size[j] == 0 && state->heapinfo2[i].busy_frag.frag_size[j] == 0){ + if (state->heapinfo1[i].busy_frag.frag_size[j] == 0 + && state->heapinfo2[i].busy_frag.frag_size[j] == 0) { continue; } - - + + /*if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){ - distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); - XBT_DEBUG("Different size used in fragment %zu in block %zu : %d - %d -> distance = %d", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j], distance); - continue; - }*/ - - k=0; + distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); + XBT_DEBUG("Different size used in fragment %zu in block %zu : %d - %d -> distance = %d", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j], distance); + continue; + } */ + + k = 0; //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){ - while(k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))){ - if(memcmp((char *)addr_frag1 + k, (char *)addr_frag2 + k, 1) != 0){ - distance ++; + while (k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))) { + if (memcmp((char *) addr_frag1 + k, (char *) addr_frag2 + k, 1) != + 0) { + distance++; } k++; } @@ -1485,12 +1774,11 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i++; } - + } } return distance; - -} +}