X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aeecccef59f268281e3c0423a535ccc4e001e491..7a2f8b95fa87ae7d245870be8544e7e09730e1f9:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index 1bf6f9b98e..61d7da7e6f 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -15,6 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, xbt_dynar_t mc_heap_comparison_ignore; xbt_dynar_t stacks_areas; +void *maestro_stack_start, *maestro_stack_end; static void heap_area_pair_free(heap_area_pair_t pair); static void heap_area_pair_free_voidp(void *d); @@ -22,11 +23,14 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int b static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2); static heap_area_t new_heap_area(int block, int fragment); -static size_t heap_comparison_ignore_size(void *address); +static size_t heap_comparison_ignore_size(xbt_dynar_t list, void *address); static void add_heap_equality(xbt_dynar_t equals, void *a1, void *a2); static void remove_heap_equality(xbt_dynar_t equals, int address, void *a); -static char* is_stack(void *address); +static int is_stack(void *address); +static int is_block_stack(int block); +static int equal_blocks(int b1, int b2); +static int equal_fragments(int b1, int f1, int b2, int f2); void mmalloc_backtrace_block_display(void* heapinfo, int block){ @@ -112,10 +116,9 @@ void mmalloc_backtrace_display(void *addr){ void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL; malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL; size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0; +xbt_dynar_t to_ignore1 = NULL, to_ignore2 = NULL; -int ignore_done = 0; - -void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2){ +void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){ heaplimit = ((struct mdesc *)heap1)->heaplimit; @@ -124,15 +127,30 @@ void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2){ heapbase1 = (char *)heap1 + BLOCKSIZE; heapbase2 = (char *)heap2 + BLOCKSIZE; - heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)heap1->heapinfo - (char *)s_heap))); - heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)heap2->heapinfo - (char *)s_heap))); + heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)((struct mdesc *)heap1)->heapinfo - (char *)s_heap))); + heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)((struct mdesc *)heap2)->heapinfo - (char *)s_heap))); heapsize1 = heap1->heapsize; heapsize2 = heap2->heapsize; - + + to_ignore1 = i1; + to_ignore2 = i2; + + if(MC_is_active()){ + MC_ignore_data_bss(&heaplimit, sizeof(heaplimit)); + MC_ignore_data_bss(&s_heap, sizeof(s_heap)); + MC_ignore_data_bss(&heapbase1, sizeof(heapbase1)); + MC_ignore_data_bss(&heapbase2, sizeof(heapbase2)); + MC_ignore_data_bss(&heapinfo1, sizeof(heapinfo1)); + MC_ignore_data_bss(&heapinfo2, sizeof(heapinfo2)); + MC_ignore_data_bss(&heapsize1, sizeof(heapsize1)); + MC_ignore_data_bss(&heapsize2, sizeof(heapsize2)); + MC_ignore_data_bss(&to_ignore1, sizeof(to_ignore1)); + MC_ignore_data_bss(&to_ignore2, sizeof(to_ignore2)); + } } -int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stack1, xbt_dynar_t *stack2, xbt_dynar_t equals){ +int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ if(heap1 == NULL && heap1 == NULL){ XBT_DEBUG("Malloc descriptors null"); @@ -145,10 +163,10 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } /* Start comparison */ - size_t i1, i2, j1, j2, k, current_block, current_fragment; + size_t i1, i2, j1, j2, k; + size_t current_block = -1; /* avoid "maybe uninitialized" warning */ + size_t current_fragment; void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; - void *snap_addr_block1, *snap_addr_block2; - char *stack_name; int nb_diff1 = 0, nb_diff2 = 0; xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); @@ -169,17 +187,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - snap_addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)heapbase1)); if(heapinfo1[i1].type == 0){ /* Large block */ - if((xbt_dynar_length(*stack1) < xbt_dynar_length(stacks_areas)) && ((stack_name = is_stack(addr_block1)) != NULL)){ - stack_region_t stack = xbt_new0(s_stack_region_t, 1); - stack->address = snap_addr_block1; - stack->process_name = strdup(stack_name); - stack->size = heapinfo1[i1].busy_block.busy_size; - xbt_dynar_push(*stack1, &stack); - res_compare = -1; + if(is_stack(addr_block1)){ + for(k=0; k < heapinfo1[i1].busy_block.size; k++) + heapinfo1[i1+k].busy_block.equal_to = new_heap_area(i1, -1); + for(k=0; k < heapinfo2[i1].busy_block.size; k++) + heapinfo2[i1+k].busy_block.equal_to = new_heap_area(i1, -1); + i1 = i1 + heapinfo1[current_block].busy_block.size; + continue; } if(heapinfo1[i1].busy_block.equal_to != NULL){ @@ -197,26 +214,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac if(heapinfo2[current_block].busy_block.equal_to == NULL){ addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - snap_addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2)); - - if((xbt_dynar_length(*stack2) < xbt_dynar_length(stacks_areas)) && ((stack_name = is_stack(addr_block2)) != NULL)){ - stack_region_t stack = xbt_new0(s_stack_region_t, 1); - stack->address = snap_addr_block2; - stack->process_name = strdup(stack_name); - stack->size = heapinfo2[current_block].busy_block.busy_size; - xbt_dynar_push(*stack2, &stack); - res_compare = -1; - } - res_compare = compare_area(addr_block1, addr_block2, previous, equals); + res_compare = compare_area(addr_block1, addr_block2, previous); - if(res_compare == 0 || res_compare == -1){ + if(res_compare == 0){ for(k=1; k < heapinfo2[current_block].busy_block.size; k++) heapinfo2[current_block+k].busy_block.equal_to = new_heap_area(i1, -1); for(k=1; k < heapinfo1[current_block].busy_block.size; k++) heapinfo1[current_block+k].busy_block.equal_to = new_heap_area(i1, -1); equal = 1; - match_equals(previous, equals); + match_equals(previous); i1 = i1 + heapinfo1[current_block].busy_block.size; } @@ -229,16 +236,6 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac while(i2 <= heaplimit && !equal){ addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - snap_addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2)); - - if((xbt_dynar_length(*stack2) < xbt_dynar_length(stacks_areas)) && ((stack_name = is_stack(addr_block2)) != NULL)){ - stack_region_t stack = xbt_new0(s_stack_region_t, 1); - stack->address = snap_addr_block2; - stack->process_name = strdup(stack_name); - stack->size = heapinfo2[i2].busy_block.busy_size; - xbt_dynar_push(*stack2, &stack); - res_compare = -1; - } if(i2 == current_block){ i2++; @@ -255,15 +252,15 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac continue; } - res_compare = compare_area(addr_block1, addr_block2, previous, equals); + res_compare = compare_area(addr_block1, addr_block2, previous); - if(res_compare == 0 || res_compare == -1){ + if(res_compare == 0){ for(k=1; k < heapinfo2[i2].busy_block.size; k++) heapinfo2[i2+k].busy_block.equal_to = new_heap_area(i1, -1); for(k=1; k < heapinfo1[i1].busy_block.size; k++) heapinfo1[i1+k].busy_block.equal_to = new_heap_area(i2, -1); equal = 1; - match_equals(previous, equals); + match_equals(previous); i1 = i1 + heapinfo1[i1].busy_block.size; } @@ -274,7 +271,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } if(!equal){ - XBT_DEBUG("Block %zu not found (size_used = %zu)", i1, heapinfo1[i1].busy_block.busy_size); + XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, heapinfo1[i1].busy_block.busy_size, addr_block1); i1 = heaplimit + 1; nb_diff1++; } @@ -304,11 +301,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); addr_frag2 = (void*) ((char *)addr_block2 + (current_fragment << ((xbt_mheap_t)s_heap)->heapinfo[current_block].type)); - res_compare = compare_area(addr_frag1, addr_frag2, previous, equals); + res_compare = compare_area(addr_frag1, addr_frag2, previous); if(res_compare == 0){ equal = 1; - match_equals(previous, equals); + match_equals(previous); } xbt_dynar_reset(previous); @@ -330,16 +327,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac continue; if(heapinfo2[i2].busy_frag.equal_to[j2] != NULL) - continue; + continue; addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); addr_frag2 = (void*) ((char *)addr_block2 + (j2 << ((xbt_mheap_t)s_heap)->heapinfo[i2].type)); - res_compare = compare_area(addr_frag1, addr_frag2, previous, equals); + res_compare = compare_area(addr_frag1, addr_frag2, previous); if(res_compare == 0){ equal = 1; - match_equals(previous, equals); + match_equals(previous); xbt_dynar_reset(previous); break; } @@ -353,7 +350,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } if(heapinfo1[i1].busy_frag.equal_to[j1] == NULL){ - XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %d)", i1, j1, heapinfo1[i1].busy_frag.frag_size[j1]); + XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p, ignore %d)", i1, j1, heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1, heapinfo1[i1].busy_frag.ignore[j1]); i2 = heaplimit + 1; i1 = heaplimit + 1; nb_diff1++; @@ -370,6 +367,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac /* 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<=heaplimit){ if(heapinfo1[i].type == 0){ @@ -385,31 +383,32 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } } } - xbt_free(heapinfo1[i].busy_block.equal_to); - heapinfo1[i].busy_block.equal_to = NULL; } if(heapinfo1[i].type > 0){ addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); + real_addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)s_heap)->heapbase)); for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){ if(current_block == heaplimit){ if(heapinfo1[i].busy_frag.frag_size[j] > 0){ if(heapinfo1[i].busy_frag.equal_to[j] == NULL){ if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ addr_frag1 = (void*) ((char *)addr_block1 + (j << heapinfo1[i].type)); - XBT_DEBUG("Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag1, heapinfo1[i].busy_frag.frag_size[j]); + real_addr_frag1 = (void*) ((char *)real_addr_block1 + (j << ((struct mdesc *)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, heapinfo1[i].busy_frag.frag_size[j]); //mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j); } nb_diff1++; } } } - xbt_free(heapinfo1[i].busy_frag.equal_to[j]); - heapinfo1[i].busy_frag.equal_to[j] = NULL; } } i++; } + if(current_block == heaplimit) + XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); + i = 1; while(i<=heaplimit){ @@ -426,24 +425,65 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac } } } - xbt_free(heapinfo2[i].busy_block.equal_to); - heapinfo2[i].busy_block.equal_to = NULL; } if(heapinfo2[i].type > 0){ addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + real_addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)s_heap)->heapbase)); for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){ if(current_block == heaplimit){ if(heapinfo2[i].busy_frag.frag_size[j] > 0){ if(heapinfo2[i].busy_frag.equal_to[j] == NULL){ if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ addr_frag2 = (void*) ((char *)addr_block2 + (j << heapinfo2[i].type)); - XBT_DEBUG( "Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag2, heapinfo2[i].busy_frag.frag_size[j]); + real_addr_frag2 = (void*) ((char *)real_addr_block2 + (j << ((struct mdesc *)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, heapinfo2[i].busy_frag.frag_size[j]); //mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j); } nb_diff2++; } } } + } + } + i++; + } + + if(current_block == 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; + + return ((nb_diff1 > 0) || (nb_diff2 > 0)); +} + +void reset_heap_information(){ + + size_t i = 0, j; + + while(i<=heaplimit){ + if(heapinfo1[i].type == 0){ + xbt_free(heapinfo1[i].busy_block.equal_to); + heapinfo1[i].busy_block.equal_to = NULL; + } + if(heapinfo1[i].type > 0){ + for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){ + xbt_free(heapinfo1[i].busy_frag.equal_to[j]); + heapinfo1[i].busy_frag.equal_to[j] = NULL; + } + } + i++; + } + + i = 0; + + while(i<=heaplimit){ + if(heapinfo2[i].type == 0){ + xbt_free(heapinfo2[i].busy_block.equal_to); + heapinfo2[i].busy_block.equal_to = NULL; + } + if(heapinfo2[i].type > 0){ + for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){ xbt_free(heapinfo2[i].busy_frag.equal_to[j]); heapinfo2[i].busy_frag.equal_to[j] = NULL; } @@ -451,13 +491,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac i++; } - xbt_dynar_free(&previous); - ignore_done = 0; s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL; heapinfo1 = NULL, heapinfo2 = NULL; heaplimit = 0, heapsize1 = 0, heapsize2 = 0; + to_ignore1 = NULL, to_ignore2 = NULL; - return ((nb_diff1 > 0) || (nb_diff2 > 0)); } static heap_area_t new_heap_area(int block, int fragment){ @@ -469,16 +507,16 @@ static heap_area_t new_heap_area(int block, int fragment){ } -static size_t heap_comparison_ignore_size(void *address){ +static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ unsigned int cursor = 0; int start = 0; - int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + int end = xbt_dynar_length(ignore_list) - 1; mc_heap_ignore_region_t region; while(start <= end){ cursor = (start + end) / 2; - region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); + 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) @@ -491,13 +529,15 @@ static size_t heap_comparison_ignore_size(void *address){ } -int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equals){ +int compare_area(void *area1, void* area2, xbt_dynar_t previous){ /* Return code : 0 = equal, 1 = same size but different bytes, 2 = different size used */ size_t i = 0, pointer_align = 0, ignore1 = 0, ignore2 = 0; - void *address_pointed1, *address_pointed2; + void *addr_pointed1, *addr_pointed2; int res_compare; - size_t block1, frag1, block2, frag2, size; + size_t block1, frag1, block2, frag2; + ssize_t size; int check_ignore = 0; + int j; void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; void *area1_to_compare, *area2_to_compare; @@ -512,8 +552,21 @@ int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equ block1 = ((char*)area1 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; block2 = ((char*)area2 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; - if(((char *)area1 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block1 > heapsize1) || (block1 < 1) || ((char *)area2 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block2 > heapsize2) || (block2 < 1)) + if(is_block_stack((int)block1) && is_block_stack((int)block2)){ + add_heap_area_pair(previous, block1, -1, block2, -1); + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + + if(((char *)area1 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block1 > heapsize1) || (block1 < 1) || ((char *)area2 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block2 > heapsize2) || (block2 < 1)){ + if(match_pairs){ + xbt_dynar_free(&previous); + } return 1; + } addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)heapbase1)); addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)heapbase2)); @@ -521,15 +574,47 @@ int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equ if(heapinfo1[block1].type == heapinfo2[block2].type){ if(heapinfo1[block1].type == -1){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } return 0; }else if(heapinfo1[block1].type == 0){ - if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size) - return 1; - if(heapinfo1[block1].busy_block.busy_size != heapinfo2[block2].busy_block.busy_size) + + if(heapinfo1[block1].busy_block.equal_to != NULL || heapinfo2[block2].busy_block.equal_to != NULL){ + if(equal_blocks(block1, block2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } + } + if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size){ + if(match_pairs){ + xbt_dynar_free(&previous); + } return 1; - if(!add_heap_area_pair(previous, block1, -1, block2, -1)) + } + if(heapinfo1[block1].busy_block.busy_size != heapinfo2[block2].busy_block.busy_size){ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 2; + } + if(!add_heap_area_pair(previous, block1, -1, block2, -1)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } return 0; - + } + size = heapinfo1[block1].busy_block.busy_size; frag1 = -1; frag2 = -1; @@ -537,39 +622,97 @@ int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equ area1_to_compare = addr_block1; area2_to_compare = addr_block2; - if((ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)) && heapinfo1[block1].busy_block.ignore == 1) + if(heapinfo1[block1].busy_block.ignore == 1 || heapinfo2[block2].busy_block.ignore == 1) check_ignore = 1; + }else{ frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; - - if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]) - return 1; - if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)) - return 0; - + addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << heapinfo1[block1].type)); addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << heapinfo2[block2].type)); - + area1_to_compare = addr_frag1; area2_to_compare = addr_frag2; + + if(heapinfo1[block1].busy_frag.equal_to[frag1] != NULL || heapinfo2[block2].busy_frag.equal_to[frag2] != NULL){ + if(equal_fragments(block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } + } + + if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 2; + } + if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + size = heapinfo1[block1].busy_frag.frag_size[frag1]; - if(size == 0) + if(size == -1){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } return 0; - - if((ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)) && heapinfo1[block1].busy_frag.ignore[frag1] == 1) + } + + if(heapinfo1[block1].busy_frag.ignore[frag1] == 1 || heapinfo2[block2].busy_frag.ignore[frag2] == 1) check_ignore = 1; + } }else if((heapinfo1[block1].type > 0) && (heapinfo2[block2].type > 0)){ + frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; - if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]) - return 1; - if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)) + if(heapinfo1[block1].busy_frag.equal_to[frag1] != NULL || heapinfo2[block2].busy_frag.equal_to[frag2] != NULL){ + if(equal_fragments(block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } + } + + if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 2; + } + + if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } return 0; + } addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << heapinfo1[block1].type)); addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << heapinfo2[block2].type)); @@ -579,51 +722,61 @@ int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equ size = heapinfo1[block1].busy_frag.frag_size[frag1]; - if(size == 0) + if(size == -1){ + if(match_pairs){ + xbt_dynar_free(&previous); + } return 0; + } - if((ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)) && heapinfo1[block1].busy_frag.ignore[frag1] == 1) + if(heapinfo1[block1].busy_frag.ignore[frag1] == 1 || heapinfo2[block2].busy_frag.ignore[frag2] == 1) check_ignore = 1; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } return 1; } while(i 0){ - if((ignore2 = heap_comparison_ignore_size((char *)area2 + i)) == ignore1){ + if(check_ignore){ + if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)area1 + i)) > 0){ + if((ignore2 = heap_comparison_ignore_size(to_ignore2, (char *)area2 + i)) == ignore1){ i = i + ignore2; - ignore_done++; continue; } } } - - if(memcmp(((char *)area1_to_compare) + i, ((char *)area2_to_compare) + i, 1) != 0){ - /* Check pointer difference */ - pointer_align = (i / sizeof(void*)) * sizeof(void*); - address_pointed1 = *((void **)((char *)area1_to_compare + pointer_align)); - address_pointed2 = *((void **)((char *)area2_to_compare + pointer_align)); - - res_compare = compare_area(address_pointed1, address_pointed2, previous, equals); - - if(res_compare == 1) - return 1; + pointer_align = (i / sizeof(void*)) * sizeof(void*); + addr_pointed1 = *((void **)((char *)area1_to_compare + pointer_align)); + addr_pointed2 = *((void **)((char *)area2_to_compare + pointer_align)); + 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 > s_heap) && ((char *)addr_pointed1 < (char *)s_heap + STD_HEAP_SIZE) + && (addr_pointed2 > s_heap) && ((char *)addr_pointed2 < (char *)s_heap + STD_HEAP_SIZE)){ + res_compare = compare_area(addr_pointed1, addr_pointed2, previous); + if(res_compare != 0) + return res_compare; }else{ - - i++; - + j=0; + while(jfragment1 != -1){ - - real_addr_block1 = ((void*) (((ADDR2UINT((size_t)current_pair->block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - real_addr_frag1 = (void*) ((char *)real_addr_block1 + (current_pair->fragment1 << heapinfo1[current_pair->block1].type)); - real_addr_block2 = ((void*) (((ADDR2UINT((size_t)current_pair->block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - real_addr_frag2 = (void*) ((char *)real_addr_block2 + (current_pair->fragment2 << heapinfo2[current_pair->block2].type)); - + if(heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] != NULL){ - remove_heap_equality(equals, 1, real_addr_frag1); previous_area = heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1]; xbt_free(heapinfo2[previous_area->block].busy_frag.equal_to[previous_area->fragment]); heapinfo2[previous_area->block].busy_frag.equal_to[previous_area->fragment] = NULL; xbt_free(previous_area); } if(heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] != NULL){ - remove_heap_equality(equals, 2, real_addr_frag2); previous_area = heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2]; xbt_free(heapinfo1[previous_area->block].busy_frag.equal_to[previous_area->fragment]); heapinfo1[previous_area->block].busy_frag.equal_to[previous_area->fragment] = NULL; xbt_free(previous_area); } - - if(real_addr_frag1 != real_addr_frag2) - add_heap_equality(equals, real_addr_frag1, real_addr_frag2); heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = new_heap_area(current_pair->block2, current_pair->fragment2); heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = new_heap_area(current_pair->block1, current_pair->fragment1); }else{ - real_addr_block1 = ((void*) (((ADDR2UINT((size_t)current_pair->block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - real_addr_block2 = ((void*) (((ADDR2UINT((size_t)current_pair->block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - if(heapinfo1[current_pair->block1].busy_block.equal_to != NULL){ - remove_heap_equality(equals, 1, real_addr_block1); previous_area = heapinfo1[current_pair->block1].busy_block.equal_to; xbt_free(heapinfo2[previous_area->block].busy_block.equal_to); heapinfo2[previous_area->block].busy_block.equal_to = NULL; xbt_free(previous_area); } if(heapinfo2[current_pair->block2].busy_block.equal_to != NULL){ - remove_heap_equality(equals, 2, real_addr_block2); previous_area = heapinfo2[current_pair->block2].busy_block.equal_to; xbt_free(heapinfo1[previous_area->block].busy_block.equal_to); heapinfo1[previous_area->block].busy_block.equal_to = NULL; xbt_free(previous_area); } - - if(real_addr_block1 != real_addr_block2) - add_heap_equality(equals, real_addr_block1, real_addr_block2); heapinfo1[current_pair->block1].busy_block.equal_to = new_heap_area(current_pair->block2, current_pair->fragment2); heapinfo2[current_pair->block2].busy_block.equal_to = new_heap_area(current_pair->block1, current_pair->fragment1); @@ -740,7 +872,6 @@ void match_equals(xbt_dynar_t list, xbt_dynar_t equals){ } } - } #ifndef max @@ -871,16 +1002,28 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ } -static char* 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) - return stack->process_name; + return 1; + } + + return 0; +} + +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) + return 1; } - return NULL; + return 0; } static void add_heap_equality(xbt_dynar_t equals, void *a1, void *a2){ @@ -999,7 +1142,25 @@ int is_free_area(void *area, xbt_mheap_t heap){ } return 0; - + +} +static int equal_blocks(int b1, int b2){ + if(heapinfo1[b1].busy_block.equal_to != NULL){ + if(heapinfo2[b2].busy_block.equal_to != NULL){ + if(((heap_area_t)(heapinfo1[b1].busy_block.equal_to))->block == b2 && ((heap_area_t)(heapinfo2[b2].busy_block.equal_to))->block == b1) + return 1; + } + } + return 0; +} +static int equal_fragments(int b1, int f1, int b2, int f2){ + if(heapinfo1[b1].busy_frag.equal_to[f1] != NULL){ + if(heapinfo2[b2].busy_frag.equal_to[f2] != NULL){ + if(((heap_area_t)(heapinfo1[b1].busy_frag.equal_to[f1]))->block == b2 && ((heap_area_t)(heapinfo2[b2].busy_frag.equal_to[f2]))->block == b1 && ((heap_area_t)(heapinfo1[b1].busy_frag.equal_to[f1]))->fragment == f2 && ((heap_area_t)(heapinfo2[b2].busy_frag.equal_to[f2]))->fragment == f1) + return 1; + } + } + return 0; }