X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66549cfbea582874b4fb599673d38b84abaa25d4..6479f2478ed2c405d6f97e6aa87799b569f13319:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index e6c78abf36..8e209cf1f7 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -14,35 +14,54 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, extern char *xbt_binary_name; -void mmalloc_backtrace_block_display(void* heapinfo, size_t block){ +xbt_dynar_t mmalloc_ignore; + +typedef struct s_heap_area_pair{ + int block1; + int fragment1; + int block2; + int fragment2; +}s_heap_area_pair_t, *heap_area_pair_t; + +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 int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous); +static void match_equals(xbt_dynar_t list); + +static size_t heap_comparison_ignore(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 +70,458 @@ 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){ +void *s_heap, *heapbase1, *heapbase2; +malloc_info *heapinfo1, *heapinfo2; +size_t heaplimit, heapsize1, heapsize2; + +int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ - if(mdp1 == NULL && mdp2 == NULL){ - fprintf(stderr, "Malloc descriptors null\n"); + if(heap1 == NULL && heap1 == NULL){ + XBT_DEBUG("Malloc descriptors null"); return 0; } - int errors = mmalloc_compare_mdesc(mdp1, mdp2); - - return (errors > 0); - -} - -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){ - - int errors = 0; - - if(mdp1->heaplimit != mdp2->heaplimit){ - fprintf(stderr,"Different limit of valid info table indices\n"); + if(heap1->heaplimit != heap2->heaplimit){ + XBT_DEBUG("Different limit of valid info table indices"); return 1; } - void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); + /* Heap information */ + heaplimit = ((struct mdesc *)heap1)->heaplimit; - fprintf(stderr, "s_heap->heapbase : %p\n", ((struct mdesc*)s_heap)->heapbase); + s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize(); - void *heapbase1 = (char *)mdp1 + BLOCKSIZE; - void *heapbase2 = (char *)mdp2 + BLOCKSIZE; + heapbase1 = (char *)heap1 + BLOCKSIZE; + heapbase2 = (char *)heap2 + BLOCKSIZE; - fprintf(stderr, "Heapbase1 : %p, Heapbase2 : %p\n", heapbase1, heapbase2); - fprintf(stderr, "Heapinfo : %p\n", mdp1->heapinfo); + 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))); - 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)); + heapsize1 = heap1->heapsize; + heapsize2 = heap2->heapsize; - fprintf(stderr, "Heapinfo1 : %p, Heapinfo2 : %p\n", heapinfo1, heapinfo2); - - size_t i, j; - void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL; - size_t frag_size; + /* Start comparison */ + size_t i1, i2, j1, j2, k; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + size_t frag_size1, frag_size2; - i = 1; + xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); - int k = 0; - int distance = 0; - int total_distance = 0; + int equal; - 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){ + i2 = 1; + equal = 0; - 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)); - if(heapinfo1[i].type == 0){ /* busy large block */ + if(heapinfo1[i1].type == 0){ /* Large block */ - 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++; - } + while(i2 <= heaplimit && !equal){ - 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++; - } + if(heapinfo2[i2].type != 0){ + i2++; + continue; + } + + if(heapinfo2[i2].busy_block.equal_to == 1){ + i2++; + continue; + } + + if(heapinfo1[i1].busy_block.size != heapinfo2[i2].busy_block.size){ + i2++; + continue; + } + + if(heapinfo1[i1].busy_block.busy_size != heapinfo2[i2].busy_block.busy_size){ + i2++; + continue; + } + + addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + + /* Comparison */ + add_heap_area_pair(previous, i1, -1, i2, -1); + if(!compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous)){ + for(k=0; k < heapinfo2[i2].busy_block.size; k++) + heapinfo2[i2+k].busy_block.equal_to = 1; + for(k=0; k < heapinfo1[i1].busy_block.size; k++) + heapinfo1[i1+k].busy_block.equal_to = 1; + equal = 1; + match_equals(previous); + } + xbt_dynar_reset(previous); - /* Hamming distance on different blocks */ - distance = 0; + i2++; + } - for(k=0;k> sizeof(void*)) * sizeof(void*); - address_pointed1 = *((void **)((char *)addr_block1 + pointer_align)); - address_pointed2 = *((void **)((char *)addr_block2 + pointer_align)); + for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ - 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(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */ + continue; + + addr_frag1 = (void*) ((char *)addr_block1 + (j1 * frag_size1)); + + i2 = 1; + equal = 0; + + while(i2 <= heaplimit && !equal){ - 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++; + if(heapinfo2[i2].type <= 0){ + i2++; 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)); + + frag_size2 = 1 << heapinfo2[i2].type; - fprintf(stderr, "Addr blocks pointed : %p - %p\n", addr_block_pointed1, addr_block_pointed2); + for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ - 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 - - /* 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"); - } - - }else{ - distance ++; - } + if(heapinfo2[i2].busy_frag.equal_to[j2] == 1){ + continue; } - - }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{ - 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 * frag_size2)); + + /* Comparison */ + add_heap_area_pair(previous, i1, j1, i2, j2); + if(!compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous)){ + heapinfo2[i2].busy_frag.equal_to[j2] = 1; + heapinfo1[i1].busy_frag.equal_to[j1] = 1; + equal = 1; + match_equals(previous); + break; } + xbt_dynar_reset(previous); + } - } - - } + i2++; - 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++; + } - }else{ + } - if(heapinfo1[i].type > 0){ /* busy fragmented block */ + i1++; - 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++; - } + } - 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++; + /* All blocks/fragments are equal to another block/fragment ? */ + size_t i = 1, j = 0; + int nb_diff1 = 0, nb_diff2 = 0; + size_t frag_size = 0; + + while(i 0){ + if(heapinfo1[i].busy_block.equal_to == -1){ + 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].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++; + } + } + if(heapinfo1[i].type > 0){ + frag_size = 1 << heapinfo1[i].type; + 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] == -1){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1)); + addr_frag1 = (void*) ((char *)addr_block1 + (j * frag_size)); + 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++; + } - frag_size = pow(2, heapinfo1[i].type); + XBT_DEBUG("Different blocks or fragments in heap1 : %d\n", nb_diff1); - for(j=0; j< (BLOCKSIZE/frag_size); j++){ + i = 1; - 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++; + while(i 0){ + if(heapinfo2[i].busy_block.equal_to == -1){ + 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(heapinfo2[i].type > 0){ + frag_size = 1 << heapinfo2[i].type; + 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] == -1){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2)); + addr_frag2 = (void*) ((char *)addr_block2 + (j * frag_size)); + 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.frag_size[j] > 0){ + XBT_DEBUG("Different blocks or fragments in heap2 : %d\n", nb_diff2); + + + /* Reset equal information */ + i = 1; - addr_frag1 = (char *)addr_block1 + (j * frag_size); - addr_frag2 = (char *)addr_block2 + (j * frag_size); + while(i 0){ + for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){ + heapinfo1[i].busy_frag.equal_to[j] = -1; + } + } + i++; + } - /* Hamming distance on different blocks */ - distance = 0; + i = 1; - for(k=0;k 0){ + for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){ + heapinfo2[i].busy_frag.equal_to[j] = -1; + } + } + i++; + } - if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){ + xbt_dynar_free(&previous); + + return ((nb_diff1 > 0) || (nb_diff2 > 0)); - fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); fflush(NULL); +} - 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); - - - 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)); - - 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 ++; - } - } - - }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{ - - 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 ++; - } - } - - } - } +static size_t heap_comparison_ignore(void *address){ + unsigned int cursor = 0; + mc_ignore_region_t region; + xbt_dynar_foreach(mmalloc_ignore, cursor, region){ + if(region->address == address) + return region->size; + } + return 0; +} - } - 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; +static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous){ - } + size_t i = 0, pointer_align = 0, ignore1 = 0, ignore2 = 0; + void *address_pointed1, *address_pointed2, *addr_block_pointed1, *addr_block_pointed2, *addr_frag_pointed1, *addr_frag_pointed2; + size_t block_pointed1, block_pointed2, frag_pointed1, frag_pointed2; + size_t frag_size; + int res_compare; + void *current_area1, *current_area2; + + while(iheapbase + ((((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; + continue; + } + } + + 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)); - i++; + /* 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; - }else{ /* free block */ + /* 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; - i++; + if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){ /* Same type of block (large or fragmented) */ - } + 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].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)){ + + res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous); + + if(res_compare) + return 1; + + } + + }else{ /* Fragmented block */ - fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance); + /* 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; - return (errors); -} + frag_size = 1 << heapinfo1[block_pointed1].type; + + addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 * frag_size)); + addr_frag_pointed2 = (void*) ((char *)addr_block_pointed2 + (frag_pointed2 * frag_size)); + if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){ -/* void *get_end_addr_heap(void *heap){ */ + res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous); + + if(res_compare) + return 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 *\/ */ + i = pointer_align + sizeof(void *); + + }else{ -/* fp = fopen("/proc/self/maps", "r"); */ + i++; -/* if(fp == NULL) */ -/* perror("fopen failed"); */ + } + } + return 0; + -/* xbt_dynar_t lfields = NULL; */ -/* xbt_dynar_t start_end = NULL; */ -/* void *start_addr; */ -/* void *end_addr; */ +} -/* while ((read = getline(&line, &n, fp)) != -1) { */ +static void heap_area_pair_free(heap_area_pair_t pair){ + if (pair){ + free(pair); + pair = NULL; + } +} -/* xbt_str_trim(line, NULL); */ -/* xbt_str_strip_spaces(line); */ -/* lfields = xbt_str_split(line,NULL); */ +static void heap_area_pair_free_voidp(void *d) +{ + heap_area_pair_free((heap_area_pair_t) * (void **) d); +} -/* 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); */ +static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){ -/* 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; */ -/* } */ + 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; + } -/* xbt_dynar_reset(lfields); */ -/* xbt_free(lfields); */ -/* xbt_dynar_reset(start_end); */ -/* xbt_free(start_end); */ -/* free(line); */ -/* fclose(fp); */ -/* return NULL; */ + 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){ -/* } */ + unsigned int cursor = 0; + heap_area_pair_t current_pair; + xbt_dynar_foreach(list, cursor, current_pair){ + if(current_pair->fragment1 != -1){ + heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = 1; + heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = 1; + }else{ + heapinfo1[current_pair->block1].busy_block.equal_to = 1; + heapinfo2[current_pair->block2].busy_block.equal_to = 1; + } + } +}