X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66549cfbea582874b4fb599673d38b84abaa25d4..14a69c191a473f265fb15fe827e31bcc12b39364:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index e6c78abf36..6115d9a1c3 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -8,41 +8,61 @@ #include "xbt/ex_interface.h" /* internals of backtrace setup */ #include "xbt/str.h" #include "mc/mc.h" +#include "xbt/mmalloc.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, "Logging specific to mm_diff in mmalloc"); extern char *xbt_binary_name; -void mmalloc_backtrace_block_display(void* heapinfo, size_t block){ +xbt_dynar_t mc_comparison_ignore; +xbt_dynar_t stacks_areas; + +static void heap_area_pair_free(heap_area_pair_t pair); +static void heap_area_pair_free_voidp(void *d); +static int add_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); +static heap_area_t new_heap_area(int block, int fragment); + +static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous, int check_ignore); +static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals); + +static int in_mc_comparison_ignore(int block, int fragment); +static size_t heap_comparison_ignore(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); + +void mmalloc_backtrace_block_display(void* heapinfo, int block){ xbt_ex_t e; if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) { - fprintf(stderr,"No backtrace available for that block, sorry.\n"); + XBT_DEBUG("No backtrace available for that block, sorry."); return; } memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE); -e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size; + e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size; xbt_ex_setup_backtrace(&e); if (e.used == 0) { - fprintf(stderr, "(backtrace not set)\n"); + XBT_DEBUG("(backtrace not set)"); } else if (e.bt_strings == NULL) { - fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); + XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); } else { int i; - fprintf(stderr, "Backtrace of where the block %zu was malloced (%d frames):\n", block ,e.used); + XBT_DEBUG("Backtrace of where the block %d was malloced (%d frames):", block ,e.used); for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{ - fprintf(stderr,"%d",i);fflush(NULL); - fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4); + XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4); } } + } -void mmalloc_backtrace_fragment_display(void* heapinfo, size_t block, size_t frag){ +void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){ xbt_ex_t e; @@ -51,458 +71,1024 @@ void mmalloc_backtrace_fragment_display(void* heapinfo, size_t block, size_t fra xbt_ex_setup_backtrace(&e); if (e.used == 0) { - fprintf(stderr, "(backtrace not set)\n"); + XBT_DEBUG("(backtrace not set)"); } else if (e.bt_strings == NULL) { - fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); + XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); } else { int i; - fprintf(stderr, "Backtrace of where the fragment %zu in block %zu was malloced (%d frames):\n", frag, block ,e.used); + XBT_DEBUG("Backtrace of where the fragment %d in block %d was malloced (%d frames):", frag, block ,e.used); for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{ - fprintf(stderr,"%d",i);fflush(NULL); - fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4); + XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4); } } + } -int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){ - if(mdp1 == NULL && mdp2 == NULL){ - fprintf(stderr, "Malloc descriptors null\n"); +void *s_heap, *heapbase1, *heapbase2; +malloc_info *heapinfo1, *heapinfo2; +size_t heaplimit, heapsize1, heapsize2; + +int ignore_done; + +int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stack1, xbt_dynar_t *stack2, xbt_dynar_t *equals){ + + if(heap1 == NULL && heap1 == NULL){ + XBT_DEBUG("Malloc descriptors null"); return 0; } - int errors = mmalloc_compare_mdesc(mdp1, mdp2); + if(heap1->heaplimit != heap2->heaplimit){ + XBT_DEBUG("Different limit of valid info table indices"); + return 1; + } - return (errors > 0); + /* Heap information */ + heaplimit = ((struct mdesc *)heap1)->heaplimit; -} + s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){ + heapbase1 = (char *)heap1 + BLOCKSIZE; + heapbase2 = (char *)heap2 + BLOCKSIZE; - int errors = 0; + 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))); - if(mdp1->heaplimit != mdp2->heaplimit){ - fprintf(stderr,"Different limit of valid info table indices\n"); - return 1; - } + heapsize1 = heap1->heapsize; + heapsize2 = heap2->heapsize; - void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); + /* Start comparison */ + size_t i1, i2, j1, j2, k, current_block, current_fragment; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + void *real_addr_block1, *real_addr_block2; + char *stack_name; + int nb_block1=0, nb_frag1=0, nb_block2=0, nb_frag2=0; - fprintf(stderr, "s_heap->heapbase : %p\n", ((struct mdesc*)s_heap)->heapbase); + xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); - void *heapbase1 = (char *)mdp1 + BLOCKSIZE; - void *heapbase2 = (char *)mdp2 + BLOCKSIZE; + int equal, res_compare; - fprintf(stderr, "Heapbase1 : %p, Heapbase2 : %p\n", heapbase1, heapbase2); - fprintf(stderr, "Heapinfo : %p\n", mdp1->heapinfo); + ignore_done = 0; - malloc_info* heapinfo1 = (malloc_info *)((char *)mdp1 + ((char *)mdp1->heapinfo - (char *)s_heap)); - malloc_info* heapinfo2 = (malloc_info *)((char *)mdp2 + ((char *)mdp2->heapinfo - (char *)s_heap)); + /* Init equal information */ + i1 = 1; - fprintf(stderr, "Heapinfo1 : %p, Heapinfo2 : %p\n", heapinfo1, heapinfo2); + while(i1<=heaplimit){ + if(heapinfo1[i1].type == 0){ + if(heapinfo1[i1].busy_block.busy_size > 0) + nb_block1++; + heapinfo1[i1].busy_block.equal_to = NULL; + } + if(heapinfo1[i1].type > 0){ + for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ + if(heapinfo1[i1].busy_frag.frag_size[j1] > 0) + nb_frag1++; + heapinfo1[i1].busy_frag.equal_to[j1] = NULL; + } + } + i1++; + } - size_t i, j; - void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL; - size_t frag_size; + i2 = 1; - i = 1; + while(i2<=heaplimit){ + if(heapinfo2[i2].type == 0){ + if(heapinfo2[i2].busy_block.busy_size > 0) + nb_block2++; + heapinfo2[i2].busy_block.equal_to = NULL; + } + if(heapinfo2[i2].type > 0){ + for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ + if(heapinfo2[i2].busy_frag.frag_size[j2] > 0) + nb_frag2++; + heapinfo2[i2].busy_frag.equal_to[j2] = NULL; + } + } + i2++; + } - int k = 0; - int distance = 0; - int total_distance = 0; + if(nb_block1 != nb_block2 || nb_frag1 != nb_frag2){ + XBT_DEBUG("Different number of busy blocks (%d - %d) or busy fragments (%d - %d)", nb_block1, nb_block2, nb_frag1, nb_frag2); + return 1; + } - int pointer_align; - void *address_pointed1 = NULL, *address_pointed2 = NULL; + /* Check busy blocks*/ - int block_pointed1, block_pointed2, frag_pointed1, frag_pointed2; - void *addr_block_pointed1 = NULL, *addr_block_pointed2 = NULL, *addr_frag_pointed1 = NULL, *addr_frag_pointed2 = NULL; + i1 = 1; - /* Check busy blocks*/ + while(i1 <= heaplimit){ - while(i < mdp1->heaplimit){ + current_block = i1; - if(heapinfo1[i].type != heapinfo2[i].type){ - fprintf(stderr,"Different type of block : %d - %d\n", heapinfo1[i].type, heapinfo2[i].type); - errors++; + if(heapinfo1[i1].type == -1){ /* Free block */ + i1++; + continue; } - /* Get address of block i in each heap */ - addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); - addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)heapbase1)); + real_addr_block1 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block1) - (char *)heapbase1); + + if(heapinfo1[i1].type == 0){ /* Large block */ + + if((stack_name = is_stack(real_addr_block1)) != NULL){ + stack_region_t stack = xbt_new0(s_stack_region_t, 1); + stack->address = addr_block1; + stack->process_name = strdup(stack_name); + stack->size = heapinfo1[i1].busy_block.busy_size; + xbt_dynar_push(*stack1, &stack); + } - if(heapinfo1[i].type == 0){ /* busy large block */ + if(heapinfo1[i1].busy_block.busy_size == 0){ + i1++; + continue; + } - if(heapinfo1[i].busy_block.size != heapinfo2[i].busy_block.size){ - fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); - fflush(NULL); - errors++; + if(heapinfo1[i1].busy_block.equal_to != NULL){ + i1++; + continue; } + + i2 = 1; + equal = 0; + + /* Try first to associate to same block in the other heap */ + if(heapinfo2[current_block].type == heapinfo1[current_block].type){ + + if(heapinfo2[current_block].busy_block.equal_to == NULL){ + + if(heapinfo1[current_block].busy_block.busy_size == heapinfo2[current_block].busy_block.busy_size){ + + addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2)); + real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2); + + if((stack_name = is_stack(real_addr_block2)) != NULL){ + stack_region_t stack = xbt_new0(s_stack_region_t, 1); + stack->address = addr_block2; + stack->process_name = strdup(stack_name); + stack->size = heapinfo2[current_block].busy_block.busy_size; + xbt_dynar_push(*stack2, &stack); + } + + add_heap_area_pair(previous, current_block, -1, current_block, -1); + + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore((int)current_block, -1)) + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 1); + else + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0); + }else{ + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0); + } + + 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); + i1 = i1 + heapinfo1[current_block].busy_block.size; + } + + xbt_dynar_reset(previous); + + } - if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){ - fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size); - fflush(NULL); - errors++; + } + } - /* Hamming distance on different blocks */ - distance = 0; + while(i2 <= heaplimit && !equal){ + + addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2); + + if((stack_name = is_stack(real_addr_block2)) != NULL){ + stack_region_t stack = xbt_new0(s_stack_region_t, 1); + stack->address = addr_block2; + stack->process_name = strdup(stack_name); + stack->size = heapinfo2[i2].busy_block.busy_size; + xbt_dynar_push(*stack2, &stack); + } + + if(i2 == current_block){ + i2++; + continue; + } + if(heapinfo2[i2].type != 0){ + i2++; + continue; + } - for(k=0;k> sizeof(void*)) * sizeof(void*); - address_pointed1 = *((void **)((char *)addr_block1 + pointer_align)); - address_pointed2 = *((void **)((char *)addr_block2 + pointer_align)); + xbt_dynar_reset(previous); - fprintf(stderr, "Addresses pointed : %p - %p \n", address_pointed1, address_pointed2); - - /* Get block number */ - block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1; - block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1; - - fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2); - - if((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) { - fprintf(stderr, "Unknown pointer(s) ! \n"); - fflush(NULL); - distance++; - continue; - } - - addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1)); - addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + i2++; + + } + + if(!equal) + i1++; + + }else{ /* Fragmented block */ + + for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ + + current_fragment = j1; + + if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ + continue; + + if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL) + continue; - fprintf(stderr, "Addr blocks pointed : %p - %p\n", addr_block_pointed1, addr_block_pointed2); + addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].type)); - if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){ + i2 = 1; + equal = 0; + + /* Try first to associate to same fragment in the other heap */ + if(heapinfo2[current_block].type == heapinfo1[current_block].type){ + + if(heapinfo2[current_block].busy_frag.equal_to[current_fragment] == NULL){ + + if(heapinfo1[current_block].busy_frag.frag_size[current_fragment] == heapinfo2[current_block].busy_frag.frag_size[current_fragment]){ + + addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2)); + addr_frag2 = (void*) ((char *)addr_block2 + (current_fragment << heapinfo2[current_block].type)); + + add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment); - if(heapinfo1[block_pointed1].type == 0){ // Large block - - if(heapinfo1[block_pointed1].busy_block.busy_size == heapinfo2[block_pointed2].busy_block.busy_size){ - - if(memcmp(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size) != 0){ - distance++; + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore((int)current_block, (int)current_fragment)) + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 1); + else + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0); }else{ - fprintf(stderr, "False difference detected\n"); + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0); } - - }else{ - distance++; - } - - }else{ // Fragmented block - - /* Get fragment number */ - frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type; - frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type; - - fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2); - - addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type)); - addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type)); - - fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2); - - fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]); - - if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){ - - if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){ - distance++; - }else{ - fprintf(stderr, "False difference detected\n"); + + if(res_compare == 0){ + equal = 1; + match_equals(previous, equals); } - - }else{ - distance ++; + + xbt_dynar_reset(previous); + } + } - - }else{ - if(((heapinfo1[block_pointed1].type == 0) && (heapinfo2[block_pointed2].type != 0)) || ((heapinfo1[block_pointed1].type != 0) && (heapinfo2[block_pointed2].type == 0))){ - fprintf(stderr, "Pointers on blocks with different types \n"); - distance++; - }else{ + } + + while(i2 <= heaplimit && !equal){ + + + if(heapinfo2[i2].type <= 0){ + i2++; + continue; + } + + for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ + + if(heapinfo2[i2].type == heapinfo1[i1].type && i2 == current_block && j2 == current_fragment) + continue; + + if(heapinfo2[i2].busy_frag.equal_to[j2] != NULL) + continue; - frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type; - frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type; - - fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2); - - addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type)); - addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type)); - - fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2); - - fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]); - - if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){ - - if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){ - distance++; - }else{ - fprintf(stderr, "False difference detected\n"); - } - - }else{ - distance ++; - } + if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]) /* Different size_used */ + continue; + + addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + addr_frag2 = (void*) ((char *)addr_block2 + (j2 << heapinfo2[i2].type)); + + /* Comparison */ + add_heap_area_pair(previous, i1, j1, i2, j2); + + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore((int)i1, (int)j1)) + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 1); + else + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 0); + }else{ + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 0); } + + if(res_compare == 0){ + equal = 1; + match_equals(previous, equals); + break; + } + + xbt_dynar_reset(previous); + } + + i2++; + } - + } + i1++; + + } - if(distance>0){ - fprintf(stderr,"\nDifferent data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, heapinfo1[i].busy_block.size, heapinfo1[i].busy_block.busy_size); - fflush(NULL); - fprintf(stderr, "Hamming distance between blocks : %d\n", distance); - mmalloc_backtrace_block_display(heapinfo1, i); - mmalloc_backtrace_block_display(heapinfo2, i); - fprintf(stderr, "\n"); - errors++; - total_distance += distance; - } + } - i++; + /* All blocks/fragments are equal to another block/fragment ? */ + size_t i = 1, j = 0; + int nb_diff1 = 0, nb_diff2 = 0; + + while(i 0){ + if(heapinfo1[i].busy_block.equal_to == NULL){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); + XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block1, heapinfo1[i].busy_block.busy_size); + mmalloc_backtrace_block_display((void*)heapinfo1, i); + } + nb_diff1++; + } + } + } + if(heapinfo1[i].type > 0){ + addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); + for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){ + 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]); + mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j); + } + nb_diff1++; + } + } + } + } + + i++; + } - }else{ + XBT_DEBUG("Different blocks or fragments in heap1 : %d", nb_diff1); - if(heapinfo1[i].type > 0){ /* busy fragmented block */ + i = 1; - if(heapinfo1[i].type != heapinfo2[i].type){ - fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, heapinfo1[i].type, heapinfo2[i].type); fflush(NULL); - errors++; + while(i 0){ + if(heapinfo2[i].busy_block.equal_to == NULL){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block2, heapinfo2[i].busy_block.busy_size); + mmalloc_backtrace_block_display((void*)heapinfo2, i); + } + nb_diff2++; } - - if(heapinfo1[i].busy_frag.nfree != heapinfo2[i].busy_frag.nfree){ - fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, heapinfo1[i].busy_frag.nfree, heapinfo2[i].busy_frag.nfree); fflush(NULL); - errors++; + } + } + if(heapinfo2[i].type > 0){ + addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){ + 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]); + mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j); + } + nb_diff2++; + } } + } + } + i++; + } - if(heapinfo1[i].busy_frag.first != heapinfo2[i].busy_frag.first){ - fprintf(stderr,"Different first free fragment in fragmented block %zu : %zu - %zu\n", i, heapinfo1[i].busy_frag.first, heapinfo2[i].busy_frag.first); fflush(NULL); - errors++; - } + XBT_DEBUG("Different blocks or fragments in heap2 : %d", nb_diff2); - frag_size = pow(2, heapinfo1[i].type); + xbt_dynar_free(&previous); + + return ((nb_diff1 > 0) || (nb_diff2 > 0)); - for(j=0; j< (BLOCKSIZE/frag_size); j++){ +} - if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){ - fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %hu - %hu\n", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); fflush(NULL); - errors++; - } +static heap_area_t new_heap_area(int block, int fragment){ + heap_area_t area = NULL; + area = xbt_new0(s_heap_area_t, 1); + area->block = block; + area->fragment = fragment; + return area; +} - if(heapinfo1[i].busy_frag.frag_size[j] > 0){ +static int in_mc_comparison_ignore(int block, int fragment){ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_comparison_ignore) - 1; + mc_ignore_region_t region; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_ignore_region_t)xbt_dynar_get_as(mc_comparison_ignore, cursor, mc_ignore_region_t); + if(region->block == block){ + if(region->fragment == fragment) + return 1; + if(region->fragment < fragment) + start = cursor + 1; + if(region->fragment > fragment) + end = cursor - 1; + } + if(region->block < block) + start = cursor + 1; + if(region->block > block) + end = cursor - 1; + } - addr_frag1 = (char *)addr_block1 + (j * frag_size); - addr_frag2 = (char *)addr_block2 + (j * frag_size); + return 0; +} - /* Hamming distance on different blocks */ - distance = 0; +static size_t heap_comparison_ignore(void *address){ + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_comparison_ignore) - 1; + mc_ignore_region_t region; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_ignore_region_t)xbt_dynar_get_as(mc_comparison_ignore, cursor, mc_ignore_region_t); + if(region->address == address) + return region->size; + if(region->address < address) + start = cursor + 1; + if(region->address > address) + end = cursor - 1; + } - for(k=0;kheapbase + ((((char *)area1) + i) - (char *)heapbase1); + if((ignore1 = heap_comparison_ignore(current_area1)) > 0){ + current_area2 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area2) + i) - (char *)heapbase2); + if((ignore2 = heap_comparison_ignore(current_area2)) == ignore1){ + i = i + ignore2; + ignore_done++; + continue; + } + } - pointer_align = (k / sizeof(void*)) * sizeof(void*); - address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align)); - address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align)); + } - fprintf(stderr, "Addresses pointed : %p - %p \n", address_pointed1, address_pointed2); + if(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){ + /* Check pointer difference */ + pointer_align = (i / sizeof(void*)) * sizeof(void*); + address_pointed1 = *((void **)((char *)area1 + pointer_align)); + address_pointed2 = *((void **)((char *)area2 + pointer_align)); - block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1; - block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1; + /* Get pointed blocks number */ + block_pointed1 = ((char*)address_pointed1 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; + block_pointed2 = ((char*)address_pointed2 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; - fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2); - - if((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) { - fprintf(stderr, "Unknown pointer(s) ! \n"); - fflush(NULL); - distance++; - continue; - } + /* Check if valid blocks number */ + if((char *)address_pointed1 < (char*)((xbt_mheap_t)s_heap)->heapbase || block_pointed1 > heapsize1 || block_pointed1 < 1 || (char *)address_pointed2 < (char*)((xbt_mheap_t)s_heap)->heapbase || block_pointed2 > heapsize2 || block_pointed2 < 1) + return 1; - addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1)); - addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2)); - - fprintf(stderr, "Addr block pointed : %p - %p\n", addr_block_pointed1, addr_block_pointed2); - - if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){ - - if(heapinfo1[block_pointed1].type == 0){ // Large block - - if(heapinfo1[block_pointed1].busy_block.busy_size == heapinfo2[block_pointed2].busy_block.busy_size){ - - if(memcmp(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size) != 0){ - distance++; - }else{ - fprintf(stderr, "False difference detected\n"); - } - - }else{ - distance++; - } - - }else{ // Fragmented block - - frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type; - frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type; - - fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2); - - addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type)); - addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type)); - - fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2); - - fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]); - - if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){ - - if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){ - distance++; - }else{ - fprintf(stderr, "False difference detected\n"); - } - - }else{ - distance ++; - } - } + if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){ /* Same type of block (large or fragmented) */ - }else{ + addr_block_pointed1 = ((void*) (((ADDR2UINT(block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1)); + addr_block_pointed2 = ((void*) (((ADDR2UINT(block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + + if(heapinfo1[block_pointed1].type == 0){ /* Large block */ - if(((heapinfo1[block_pointed1].type == 0) && (heapinfo2[block_pointed2].type != 0)) || ((heapinfo1[block_pointed1].type != 0) && (heapinfo2[block_pointed2].type == 0))){ - fprintf(stderr, "Pointers on blocks with different types \n"); - distance++; - }else{ - - frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type; - frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type; - - fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2); - - addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type)); - addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type)); - - fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2); - - fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]); - - if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){ - - if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){ - distance++; - }else{ - fprintf(stderr, "False difference detected\n"); - } - - }else{ - distance ++; - } - } - - } - } + if(heapinfo1[block_pointed1].busy_block.size != heapinfo2[block_pointed2].busy_block.size){ + return 1; + } + + if(heapinfo1[block_pointed1].busy_block.busy_size != heapinfo2[block_pointed2].busy_block.busy_size){ + return 1; + } + if(add_heap_area_pair(previous, block_pointed1, -1, block_pointed2, -1)){ + + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore(block_pointed1, -1)) + res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 1); + else + res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 0); + }else{ + res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 0); } + + if(res_compare == 1) + return 1; + + } + + }else{ /* Fragmented block */ + + /* Get pointed fragments number */ + frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> heapinfo1[block_pointed1].type; + frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> heapinfo2[block_pointed2].type; + + if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */ + return 1; + + addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 << heapinfo1[block_pointed1].type)); + addr_frag_pointed2 = (void*) ((char *)addr_block_pointed2 + (frag_pointed2 << heapinfo2[block_pointed2].type)); - if(distance > 0){ - fprintf(stderr,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, heapinfo1[i].busy_frag.frag_size[j], i); - fprintf(stderr, "Hamming distance between fragments : %d\n", distance); - mmalloc_backtrace_fragment_display(heapinfo1, i, j); - mmalloc_backtrace_fragment_display(heapinfo2, i, j); - fprintf(stderr, "\n"); - errors++; - total_distance += distance; + if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){ + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore(block_pointed1, frag_pointed1)) + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1); + else + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0); + }else{ + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0); } + if(res_compare == 1) + return 1; + } + + } + + }else{ + + if((heapinfo1[block_pointed1].type > 0) && (heapinfo2[block_pointed2].type > 0)){ + + addr_block_pointed1 = ((void*) (((ADDR2UINT(block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1)); + addr_block_pointed2 = ((void*) (((ADDR2UINT(block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + + frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> heapinfo1[block_pointed1].type; + frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> heapinfo2[block_pointed2].type; + + if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */ + return 1; + + addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 << heapinfo1[block_pointed1].type)); + addr_frag_pointed2 = (void*) ((char *)addr_block_pointed2 + (frag_pointed2 << heapinfo2[block_pointed2].type)); + + if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){ + + if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){ + if(in_mc_comparison_ignore(block_pointed1, frag_pointed1)) + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1); + else + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0); + }else{ + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0); + } + + if(res_compare == 1) + return 1; + + } + + }else{ + return 1; + } + + } + + i = pointer_align + sizeof(void *); + + }else{ + + i++; + + } + } + + return 0; + + +} + +static void heap_area_pair_free(heap_area_pair_t pair){ + if (pair){ + free(pair); + pair = NULL; + } +} + +static void heap_area_pair_free_voidp(void *d) +{ + heap_area_pair_free((heap_area_pair_t) * (void **) d); +} + +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)){ + 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); + + return 1; + } + + return 0; +} + +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; + } + + return 1; +} + +static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals){ + + unsigned int cursor = 0; + heap_area_pair_t current_pair; + heap_area_t previous_area; + + void *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2; + + xbt_dynar_foreach(list, cursor, current_pair){ + + if(current_pair->fragment1 != -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(heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1]); + } + 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(heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2]); + } + + 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(heapinfo1[current_pair->block1].busy_block.equal_to); + } + 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(heapinfo2[current_pair->block2].busy_block.equal_to); + } + + 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); + + } + } + + +} + +#ifndef max +#define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) +#endif + +int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ + + if(heap1 == NULL && heap1 == NULL){ + XBT_DEBUG("Malloc descriptors null"); + return 0; + } + + if(heap1->heaplimit != heap2->heaplimit){ + XBT_DEBUG("Different limit of valid info table indices"); + return 1; + } + + /* Heap information */ + heaplimit = ((struct mdesc *)heap1)->heaplimit; + + s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); + + 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))); + + heapsize1 = heap1->heapsize; + heapsize2 = heap2->heapsize; + + /* Start comparison */ + size_t i, j, k; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + + int distance = 0; + + /* Check busy blocks*/ + + i = 1; + + while(i <= heaplimit){ + + addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); + addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + + if(heapinfo1[i].type != heapinfo2[i].type){ + + distance += BLOCKSIZE; + XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, heapinfo1[i].type, heapinfo2[i].type, distance); + i++; + + }else{ + + if(heapinfo1[i].type == -1){ /* Free block */ + i++; + continue; + } + + if(heapinfo1[i].type == 0){ /* Large block */ + + if(heapinfo1[i].busy_block.size != heapinfo2[i].busy_block.size){ + distance += BLOCKSIZE * max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); + i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); + XBT_DEBUG("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.size, 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; + }*/ + + k = 0; + + //while(k < (heapinfo1[i].busy_block.busy_size)){ + while(k < heapinfo1[i].busy_block.size * BLOCKSIZE){ + if(memcmp((char *)addr_block1 + k, (char *)addr_block2 + k, 1) != 0){ + distance ++; + } + k++; + } + i++; - }else{ /* free block */ + }else { /* Fragmented block */ + + for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){ + + addr_frag1 = (void*) ((char *)addr_block1 + (j << heapinfo1[i].type)); + addr_frag2 = (void*) ((char *)addr_block2 + (j << heapinfo2[i].type)); + + if(heapinfo1[i].busy_frag.frag_size[j] == 0 && 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; + + //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){ + while(k < (BLOCKSIZE / (BLOCKSIZE >> heapinfo1[i].type))){ + if(memcmp((char *)addr_frag1 + k, (char *)addr_frag2 + k, 1) != 0){ + distance ++; + } + k++; + } + + } i++; } - + } } + return distance; + +} + +static char * 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 NULL; +} - fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance); +static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2){ + + heap_equality_t he = xbt_new0(s_heap_equality_t, 1); + he->address1 = a1; + he->address2 = a2; + + if(xbt_dynar_is_empty(*equals)){ + + xbt_dynar_insert_at(*equals, 0, &he); + + }else{ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(*equals) - 1; + heap_equality_t current_equality = NULL; + + while(start <= end){ + cursor = (start + end) / 2; + current_equality = (heap_equality_t)xbt_dynar_get_as(*equals, cursor, heap_equality_t); + if(current_equality->address1 == a1){ + if(current_equality->address2 == a2) + return; + if(current_equality->address2 < a2) + start = cursor + 1; + if(current_equality->address2 > a2) + end = cursor - 1; + } + if(current_equality->address1 < a1) + start = cursor + 1; + if(current_equality->address1 > a1) + end = cursor - 1; + } + + if(current_equality->address1 < a1) + xbt_dynar_insert_at(*equals, cursor + 1 , &he); + else + xbt_dynar_insert_at(*equals, cursor, &he); + + } - return (errors); } +static void remove_heap_equality(xbt_dynar_t *equals, int address, void *a){ + + unsigned int cursor = 0; + heap_equality_t current_equality; + int found = 0; + + if(address == 1){ -/* void *get_end_addr_heap(void *heap){ */ + int start = 0; + int end = xbt_dynar_length(*equals) - 1; -/* FILE *fp; /\* File pointer to process's proc maps file *\/ */ -/* char *line = NULL; /\* Temporal storage for each line that is readed *\/ */ -/* ssize_t read; /\* Number of bytes readed *\/ */ -/* size_t n = 0; /\* Amount of bytes to read by getline *\/ */ -/* fp = fopen("/proc/self/maps", "r"); */ + while(start <= end && found == 0){ + cursor = (start + end) / 2; + current_equality = (heap_equality_t)xbt_dynar_get_as(*equals, cursor, heap_equality_t); + if(current_equality->address1 == a) + found = 1; + if(current_equality->address1 < a) + start = cursor + 1; + if(current_equality->address1 > a) + end = cursor - 1; + } + + if(found == 1) + xbt_dynar_remove_at(*equals, cursor, NULL); + + }else{ -/* if(fp == NULL) */ -/* perror("fopen failed"); */ + xbt_dynar_foreach(*equals, cursor, current_equality){ + if(current_equality->address2 == a){ + found = 1; + break; + } + } + if(found == 1) + xbt_dynar_remove_at(*equals, cursor, NULL); -/* xbt_dynar_t lfields = NULL; */ -/* xbt_dynar_t start_end = NULL; */ -/* void *start_addr; */ -/* void *end_addr; */ + } -/* while ((read = getline(&line, &n, fp)) != -1) { */ + +} -/* xbt_str_trim(line, NULL); */ -/* xbt_str_strip_spaces(line); */ -/* lfields = xbt_str_split(line,NULL); */ +int is_free_area(void *area, xbt_mheap_t heap){ -/* start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-"); */ -/* start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16); */ -/* end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16); */ + void *sheap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); + malloc_info *heapinfo = (malloc_info *)((char *)heap + ((uintptr_t)((char *)heap->heapinfo - (char *)sheap))); + size_t heapsize = heap->heapsize; -/* if(start_addr == heap){ */ -/* free(line); */ -/* fclose(fp); */ -/* xbt_dynar_reset(lfields); */ -/* xbt_free(lfields); */ -/* xbt_dynar_reset(start_end); */ -/* xbt_free(start_end); */ -/* return end_addr; */ -/* } */ + /* Get block number */ + size_t block = ((char*)area - (char*)((xbt_mheap_t)sheap)->heapbase) / BLOCKSIZE + 1; + size_t fragment; -/* } */ + /* Check if valid block number */ + if((char *)area < (char*)((xbt_mheap_t)sheap)->heapbase || block > heapsize || block < 1) + return 0; -/* xbt_dynar_reset(lfields); */ -/* xbt_free(lfields); */ -/* xbt_dynar_reset(start_end); */ -/* xbt_free(start_end); */ -/* free(line); */ -/* fclose(fp); */ -/* return NULL; */ + if(heapinfo[block].type < 0) + return 1; + if(heapinfo[block].type == 0) + return 0; -/* } */ + if(heapinfo[block].type > 0){ + fragment = ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type; + if(heapinfo[block].busy_frag.frag_size[fragment] == 0) + return 1; + } + return 0; + +}