X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66549cfbea582874b4fb599673d38b84abaa25d4..2cf2a1f3bce79e33ead868b6ed3575b0bb332ef2:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index e6c78abf36..86733e3e26 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -1,6 +1,7 @@ /* mm_diff - Memory snapshooting and comparison */ -/* Copyright (c) 2008-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,501 +9,1296 @@ #include "xbt/ex_interface.h" /* internals of backtrace setup */ #include "xbt/str.h" #include "mc/mc.h" +#include "xbt/mmalloc.h" +#include "mc/datatypes.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, "Logging specific to mm_diff in mmalloc"); -extern char *xbt_binary_name; +xbt_dynar_t mc_heap_comparison_ignore; +xbt_dynar_t stacks_areas; +void *maestro_stack_start, *maestro_stack_end; -void mmalloc_backtrace_block_display(void* heapinfo, size_t block){ - xbt_ex_t e; +/********************************* Backtrace ***********************************/ +/******************************************************************************/ - if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) { - fprintf(stderr,"No backtrace available for that block, sorry.\n"); - return; - } +static 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"); */ + /* 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; + /* 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; */ + + /* xbt_ex_setup_backtrace(&e); */ + /* if (e.used == 0) { */ + /* fprintf(stderr, "(backtrace not set)\n"); */ + /* } 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"); */ + /* } else { */ + /* int i; */ + + /* fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used); */ + /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */ + /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */ + /* } */ + /* } */ +} - xbt_ex_setup_backtrace(&e); - if (e.used == 0) { - fprintf(stderr, "(backtrace not set)\n"); - } 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"); - } else { - int i; +static void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){ - fprintf(stderr, "Backtrace of where the block %zu was malloced (%d frames):\n", 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_ex_t e; */ + + /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE); */ + /* e.used = XBT_BACKTRACE_SIZE; */ + + /* xbt_ex_setup_backtrace(&e); */ + /* if (e.used == 0) { */ + /* fprintf(stderr, "(backtrace not set)\n"); */ + /* } 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"); */ + /* } else { */ + /* int i; */ + + /* fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used); */ + /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */ + /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */ + /* } */ + /* } */ + +} + +static void mmalloc_backtrace_display(void *addr){ + + /* size_t block, frag_nb; */ + /* int type; */ + + /* xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); */ + + /* block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1); */ + + /* type = heap->heapinfo[block].type; */ + + /* switch(type){ */ + /* case -1 : /\* Free block *\/ */ + /* fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n"); */ + /* xbt_abort(); */ + /* break; */ + /* case 0: /\* Large block *\/ */ + /* mmalloc_backtrace_block_display(heap->heapinfo, block); */ + /* break; */ + /* default: /\* Fragmented block *\/ */ + /* frag_nb = RESIDUAL(addr, BLOCKSIZE) >> type; */ + /* if(heap->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){ */ + /* fprintf(stderr , "Asked to display the backtrace of a fragment that is free. I'm puzzled\n"); */ + /* xbt_abort(); */ + /* } */ + /* mmalloc_backtrace_fragment_display(heap->heapinfo, block, frag_nb); */ + /* break; */ + /* } */ +} + + +static int compare_backtrace(int b1, int f1, int b2, int f2){ + /*int i = 0; + if(f1 != -1){ + for(i=0; i< XBT_BACKTRACE_SIZE; i++){ + if(heapinfo1[b1].busy_frag.bt[f1][i] != heapinfo2[b2].busy_frag.bt[f2][i]){ + //mmalloc_backtrace_fragment_display((void*)heapinfo1, b1, f1); + //mmalloc_backtrace_fragment_display((void*)heapinfo2, b2, f2); + return 1; + } } + }else{ + for(i=0; i< heapinfo1[b1].busy_block.bt_size; i++){ + if(heapinfo1[b1].busy_block.bt[i] != heapinfo2[b2].busy_block.bt[i]){ + //mmalloc_backtrace_block_display((void*)heapinfo1, b1); + //mmalloc_backtrace_block_display((void*)heapinfo2, b2); + return 1; + } + } + }*/ + return 0; +} + + +/*********************************** Heap comparison ***********************************/ +/***************************************************************************************/ + +__thread void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL; +__thread malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL; +__thread size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0; +__thread xbt_dynar_t to_ignore1 = NULL, to_ignore2 = NULL; +__thread heap_area_t **equals_to1, **equals_to2; + +/*********************************** Free functions ************************************/ + +static void heap_area_pair_free(heap_area_pair_t pair){ + xbt_free(pair); + pair = NULL; +} + +static void heap_area_pair_free_voidp(void *d){ + heap_area_pair_free((heap_area_pair_t) * (void **) d); +} + +static void heap_area_free(heap_area_t area){ + xbt_free(area); + area = NULL; +} + +/************************************************************************************/ + +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; +} + + +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; } -void mmalloc_backtrace_fragment_display(void* heapinfo, size_t block, size_t frag){ +static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){ - xbt_ex_t e; + 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); - memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE); - e.used = XBT_BACKTRACE_SIZE; + return 1; + } - xbt_ex_setup_backtrace(&e); - if (e.used == 0) { - fprintf(stderr, "(backtrace not set)\n"); - } 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"); - } else { - int i; + return 0; +} - fprintf(stderr, "Backtrace of where the fragment %zu in block %zu was malloced (%d frames):\n", 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); - } +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(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(ignore_list, cursor, mc_heap_ignore_region_t); + if(region->address == address) + return region->size; + if(region->address < address) + start = cursor + 1; + if(region->address > address) + end = cursor - 1; } + + return 0; } -int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){ +static int is_stack(void *address){ + unsigned int cursor = 0; + stack_region_t stack; - if(mdp1 == NULL && mdp2 == NULL){ - fprintf(stderr, "Malloc descriptors null\n"); - return 0; + xbt_dynar_foreach(stacks_areas, cursor, stack){ + if(address == stack->address) + return 1; } - int errors = mmalloc_compare_mdesc(mdp1, mdp2); + return 0; +} + +static int is_block_stack(int block){ + unsigned int cursor = 0; + stack_region_t stack; - return (errors > 0); + xbt_dynar_foreach(stacks_areas, cursor, stack){ + if(block == stack->block) + return 1; + } + return 0; } -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){ +static void match_equals(xbt_dynar_t list){ - int errors = 0; + unsigned int cursor = 0; + heap_area_pair_t current_pair; + heap_area_t previous_area; - if(mdp1->heaplimit != mdp2->heaplimit){ - fprintf(stderr,"Different limit of valid info table indices\n"); + xbt_dynar_foreach(list, cursor, current_pair){ + + if(current_pair->fragment1 != -1){ + + if(equals_to1[current_pair->block1][current_pair->fragment1] != NULL){ + previous_area = equals_to1[current_pair->block1][current_pair->fragment1]; + heap_area_free(equals_to2[previous_area->block][previous_area->fragment]); + equals_to2[previous_area->block][previous_area->fragment] = NULL; + heap_area_free(previous_area); + } + if(equals_to2[current_pair->block2][current_pair->fragment2] != NULL){ + previous_area = equals_to2[current_pair->block2][current_pair->fragment2]; + heap_area_free(equals_to1[previous_area->block][previous_area->fragment]); + equals_to1[previous_area->block][previous_area->fragment] = NULL; + heap_area_free(previous_area); + } + + equals_to1[current_pair->block1][current_pair->fragment1] = new_heap_area(current_pair->block2, current_pair->fragment2); + equals_to2[current_pair->block2][current_pair->fragment2] = new_heap_area(current_pair->block1, current_pair->fragment1); + + }else{ + + if(equals_to1[current_pair->block1][0] != NULL){ + previous_area = equals_to1[current_pair->block1][0]; + heap_area_free(equals_to2[previous_area->block][0]); + equals_to2[previous_area->block][0] = NULL; + heap_area_free(previous_area); + } + if(equals_to2[current_pair->block2][0] != NULL){ + previous_area = equals_to2[current_pair->block2][0]; + heap_area_free(equals_to1[previous_area->block][0]); + equals_to1[previous_area->block][0] = NULL; + heap_area_free(previous_area); + } + + equals_to1[current_pair->block1][0] = new_heap_area(current_pair->block2, current_pair->fragment2); + equals_to2[current_pair->block2][0] = new_heap_area(current_pair->block1, current_pair->fragment1); + + } + + } +} + +static int equal_blocks(int b1, int b2){ + + if(equals_to1[b1][0]->block == b2 && equals_to2[b2][0]->block == b1) return 1; + + return 0; +} + +static int equal_fragments(int b1, int f1, int b2, int f2){ + + if(equals_to1[b1][f1]->block == b2 && equals_to1[b1][f1]->fragment == f2 && equals_to2[b2][f2]->block == b1 && equals_to2[b2][f2]->fragment == f1) + return 1; + + return 0; +} + +int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){ + + if((((struct mdesc *)heap1)->heaplimit != ((struct mdesc *)heap2)->heaplimit) || ((((struct mdesc *)heap1)->heapsize != ((struct mdesc *)heap2)->heapsize) )) + return -1; + + int i, j; + + 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 *)((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; + + equals_to1 = malloc(heaplimit * sizeof(heap_area_t *)); + for(i=0; i<=heaplimit; i++){ + equals_to1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t)); + for(j=0; jheapbase : %p\n", ((struct mdesc*)s_heap)->heapbase); + equals_to2 = malloc(heaplimit * sizeof(heap_area_t *)); + for(i=0; i<=heaplimit; i++){ + equals_to2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t)); + for(j=0; jheapinfo); + return 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)); +} - fprintf(stderr, "Heapinfo1 : %p, Heapinfo2 : %p\n", heapinfo1, heapinfo2); +void reset_heap_information(){ - size_t i, j; - void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL; - size_t frag_size; + size_t i = 0, j; - i = 1; + for(i=0; iheaplimit){ + i1 = 1; - if(heapinfo1[i].type != heapinfo2[i].type){ - fprintf(stderr,"Different type of block : %d - %d\n", heapinfo1[i].type, heapinfo2[i].type); - errors++; + while(i1 <= heaplimit){ + + 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*)((xbt_mheap_t)s_heap)->heapbase)); + + if(heapinfo1[i1].type == 0){ /* Large block */ + + if(is_stack(addr_block1)){ + for(k=0; k < heapinfo1[i1].busy_block.size; k++) + equals_to1[i1+k][0] = new_heap_area(i1, -1); + for(k=0; k < heapinfo2[i1].busy_block.size; k++) + equals_to2[i1+k][0] = new_heap_area(i1, -1); + i1 += heapinfo1[i1].busy_block.size; + continue; + } + + if(equals_to1[i1][0] != NULL){ + i1++; + continue; + } + + i2 = 1; + equal = 0; + res_compare = 0; + + /* Try first to associate to same block in the other heap */ + if(heapinfo2[i1].type == heapinfo1[i1].type){ + + if(equals_to2[i1][0] == NULL){ + + addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); + + if(res_compare == 0){ + for(k=1; k < heapinfo2[i1].busy_block.size; k++) + equals_to2[i1+k][0] = new_heap_area(i1, -1); + for(k=1; k < heapinfo1[i1].busy_block.size; k++) + equals_to1[i1+k][0] = new_heap_area(i1, -1); + equal = 1; + i1 += heapinfo1[i1].busy_block.size; + } + + xbt_dynar_reset(previous); + + } + + } - if(heapinfo1[i].type == 0){ /* busy large block */ + while(i2 <= heaplimit && !equal){ + + addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + + if(i2 == i1){ + i2++; + continue; + } + + if(heapinfo2[i2].type != 0){ + i2++; + continue; + } + + if(equals_to2[i2][0] != NULL){ + i2++; + continue; + } + + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); + + if(res_compare == 0){ + for(k=1; k < heapinfo2[i2].busy_block.size; k++) + equals_to2[i2+k][0] = new_heap_area(i1, -1); + for(k=1; k < heapinfo1[i1].busy_block.size; k++) + equals_to1[i1+k][0] = new_heap_area(i2, -1); + equal = 1; + i1 += heapinfo1[i1].busy_block.size; + } + + xbt_dynar_reset(previous); + + i2++; - 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[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(!equal){ + 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++; + //i1++; } + + }else{ /* Fragmented block */ - /* Hamming distance on different blocks */ - distance = 0; + for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ + if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ + 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)); + i2 = 1; + equal = 0; + + /* Try first to associate to same fragment in the other heap */ + if(heapinfo2[i1].type == heapinfo1[i1].type){ - 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++; + if(equals_to2[i1][j1] == NULL){ + + addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + addr_frag2 = (void*) ((char *)addr_block2 + (j1 << ((xbt_mheap_t)s_heap)->heapinfo[i1].type)); + + res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); + + if(res_compare == 0) + equal = 1; + + xbt_dynar_reset(previous); + + } + + } + + while(i2 <= heaplimit && !equal){ + + 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)); - 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(i2 == i1 && j2 == j1) + continue; + + if(equals_to2[i2][j2] != NULL) + 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_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); - 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(res_compare == 0){ + equal = 1; + xbt_dynar_reset(previous); + break; } - - }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 ++; + + xbt_dynar_reset(previous); + + } + + i2++; + + } + + if(!equal){ + XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p)\n", i1, j1, heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1); + i2 = heaplimit + 1; + i1 = heaplimit + 1; + nb_diff1++; + break; + } + + } + + i1++; + + } + + } + + /* All blocks/fragments are equal to another block/fragment ? */ + size_t i = 1, j = 0; + void *real_addr_frag1 = NULL, *real_addr_block1 = NULL, *real_addr_block2 = NULL, *real_addr_frag2 = NULL; + + while(i<=heaplimit){ + if(heapinfo1[i].type == 0){ + if(i1 == heaplimit){ + if(heapinfo1[i].busy_block.busy_size > 0){ + if(equals_to1[i][0] == 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)); + 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(i1== heaplimit){ + if(heapinfo1[i].busy_frag.frag_size[j] > 0){ + if(equals_to1[i][j] == NULL){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_frag1 = (void*) ((char *)addr_block1 + (j << heapinfo1[i].type)); + 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++; } } } - } + } + i++; + } + + if(i1 == heaplimit) + XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); + i = 1; - 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; + while(i<=heaplimit){ + if(heapinfo2[i].type == 0){ + if(i1 == heaplimit){ + if(heapinfo2[i].busy_block.busy_size > 0){ + if(equals_to2[i][0] == 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(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(i1 == heaplimit){ + if(heapinfo2[i].busy_frag.frag_size[j] > 0){ + if(equals_to2[i][j] == NULL){ + if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){ + addr_frag2 = (void*) ((char *)addr_block2 + (j << heapinfo2[i].type)); + 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++; + } - i++; + if(i1 == heaplimit) + XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); - }else{ + xbt_dynar_free(&previous); + real_addr_frag1 = NULL, real_addr_block1 = NULL, real_addr_block2 = NULL, real_addr_frag2 = NULL; - if(heapinfo1[i].type > 0){ /* busy fragmented block */ + return ((nb_diff1 > 0) || (nb_diff2 > 0)); +} - 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++; - } +static int compare_heap_area_without_type(void *real_area1, void *real_area2, void *area1, void *area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, int size, int check_ignore){ - 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++; + int i = 0; + void *addr_pointed1, *addr_pointed2; + int pointer_align, ignore1, ignore2, res_compare; + + while(i 0){ + if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)real_area1 + i)) > 0){ + if((ignore2 = heap_comparison_ignore_size(to_ignore2, (char *)real_area2 + i)) == ignore1){ + i = i + ignore2; + check_ignore--; + continue; } + } + } - 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(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){ + + pointer_align = (i / sizeof(void*)) * sizeof(void*); + addr_pointed1 = *((void **)((char *)area1 + pointer_align)); + addr_pointed2 = *((void **)((char *)area2 + pointer_align)); + + 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_heap_area(addr_pointed1, addr_pointed2, previous, all_types, other_types, NULL, 0); + if(res_compare == 1) + return res_compare; + i = pointer_align + sizeof(void *); + continue; + }else{ + return 1; + } + + } + + i++; + + } + + return 0; + +} + + +static int compare_heap_area_with_type(void *real_area1, void *real_area2, void *area1, void *area2, + xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id, + int area_size, int check_ignore, int pointer_level){ + + if(is_stack(real_area1) && is_stack(real_area2)) + return 0; + + size_t ignore1, ignore2; + + if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) + return 0; + + dw_type_t type = xbt_dict_get_or_null(all_types, type_id); + dw_type_t subtype, subsubtype; + int res, elm_size, i, switch_types = 0; + unsigned int cursor = 0; + dw_type_t member; + void *addr_pointed1, *addr_pointed2;; + char *type_desc; + + switch(type->type){ + case e_dw_base_type: + if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) + return 0; + if(strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */ + if(real_area1 == real_area2) + return -1; + else + return (memcmp(area1, area2, area_size) != 0); + }else{ + if(area_size != -1 && type->size != area_size) + return -1; + else + return (memcmp(area1, area2, type->size) != 0); + } + break; + case e_dw_enumeration_type: + if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) + return 0; + if(area_size != -1 && type->size != area_size) + return -1; + else + return (memcmp(area1, area2, type->size) != 0); + break; + case e_dw_typedef: + return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); + break; + case e_dw_const_type: + return 0; + break; + case e_dw_array_type: + subtype = xbt_dict_get_or_null(all_types, type->dw_type_id); + switch(subtype->type){ + case e_dw_base_type: + case e_dw_enumeration_type: + case e_dw_pointer_type: + case e_dw_structure_type: + case e_dw_union_type: + if(subtype->size == 0){ /*declaration of the type, need the complete description */ + type_desc = get_type_description(all_types, subtype->name); + if(type_desc){ + subtype = xbt_dict_get_or_null(all_types, type_desc); + }else{ + subtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subtype->name)); + switch_types = 1; + } + } + elm_size = subtype->size; + break; + case e_dw_typedef: + case e_dw_volatile_type: + subsubtype = xbt_dict_get_or_null(all_types, subtype->dw_type_id); + if(subsubtype->size == 0){ /*declaration of the type, need the complete description */ + type_desc = get_type_description(all_types, subsubtype->name); + if(type_desc){ + subsubtype = xbt_dict_get_or_null(all_types, type_desc); + }else{ + subsubtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subtype->name)); + switch_types = 1; + } + } + elm_size = subsubtype->size; + break; + default : + return 0; + break; + } + for(i=0; isize; i++){ + if(switch_types) + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, type->size, check_ignore, pointer_level); + else + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, type->size, check_ignore, pointer_level); + if(res == 1) + return res; + } + break; + case e_dw_pointer_type: + if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(all_types, type->dw_type_id))->type == e_dw_subroutine_type){ + addr_pointed1 = *((void **)(area1)); + addr_pointed2 = *((void **)(area2)); + return (addr_pointed1 != addr_pointed2);; + }else{ + pointer_level++; + if(pointer_level > 1){ /* Array of pointers */ + for(i=0; i<(area_size/sizeof(void *)); i++){ + addr_pointed1 = *((void **)((char *)area1 + (i*sizeof(void *)))); + addr_pointed2 = *((void **)((char *)area2 + (i*sizeof(void *)))); + if(addr_pointed1 > 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_heap_area(addr_pointed1, addr_pointed2, previous, all_types, other_types, type->dw_type_id, pointer_level); + else + res = (addr_pointed1 != addr_pointed2); + if(res == 1) + return res; + } + }else{ + addr_pointed1 = *((void **)(area1)); + addr_pointed2 = *((void **)(area2)); + 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) + return compare_heap_area(addr_pointed1, addr_pointed2, previous, all_types, other_types, type->dw_type_id, pointer_level); + else + return (addr_pointed1 != addr_pointed2); + } + } + break; + case e_dw_structure_type: + if(type->size == 0){ /*declaration of the structure, need the complete description */ + type_desc = get_type_description(all_types, type->name); + if(type_desc){ + type = xbt_dict_get_or_null(all_types, type_desc); + }else{ + type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); + switch_types = 1; + } + } + if(area_size != -1 && type->size != area_size){ + if(area_size>type->size && area_size%type->size == 0){ + for(i=0; i<(area_size/type->size); i++){ + if(switch_types) + res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, other_types, all_types, type_id, -1, check_ignore, 0); + else + res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, all_types, other_types, type_id, -1, check_ignore, 0); + if(res == 1) + return res; } + }else{ + return -1; + } + }else{ + cursor = 0; + xbt_dynar_foreach(type->members, cursor, member){ + if(switch_types) + res = compare_heap_area_with_type((char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, other_types, all_types, member->dw_type_id, -1, check_ignore, 0); + else + res = compare_heap_area_with_type((char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, all_types, other_types, member->dw_type_id, -1, check_ignore, 0); + if(res == 1) + return res; + } + } + break; + case e_dw_union_type: + if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) + return 0; + else + return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->size, check_ignore); + break; + case e_dw_volatile_type: + return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); + break; + default: + break; + } - frag_size = pow(2, heapinfo1[i].type); + return 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++; - } +int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id, int pointer_level){ - if(heapinfo1[i].busy_frag.frag_size[j] > 0){ + int res_compare; + ssize_t block1, frag1, block2, frag2; + ssize_t size; + int check_ignore = 0; - addr_frag1 = (char *)addr_block1 + (j * frag_size); - addr_frag2 = (char *)addr_block2 + (j * frag_size); + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + void *area1_to_compare, *area2_to_compare; + dw_type_t type = NULL; + char *type_desc; + int type_size = -1; - /* Hamming distance on different blocks */ - distance = 0; + int match_pairs = 0; - for(k=0;kheapbase) / BLOCKSIZE + 1; + block2 = ((char*)area2 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; - 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); + 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; + } - 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 ++; - } - } - - } - } + 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)); + + if(type_id){ + type = xbt_dict_get_or_null(all_types, type_id); + if(type->size == 0){ + if(type->dw_type_id == NULL){ + type_desc = get_type_description(all_types, type->name); + if(type_desc) + type = xbt_dict_get_or_null(all_types, type_desc); + else + type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); + }else{ + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + } + } + if((type->type == e_dw_pointer_type) || ((type->type == e_dw_base_type) && (!strcmp(type->name, "char")))) + type_size = -1; + else + type_size = type->size; + } + + if((heapinfo1[block1].type == -1) && (heapinfo2[block2].type == -1)){ /* Free block */ - 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(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; - } + }else if((heapinfo1[block1].type == 0) && (heapinfo2[block2].type == 0)){ /* Complete block */ - } + if(equals_to1[block1][0] != NULL && equals_to2[block2][0] != NULL){ + if(equal_blocks(block1, block2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); } + return 0; + } + } - i++; + if(type_size != -1){ + if(type_size != heapinfo1[block1].busy_block.busy_size && type_size != heapinfo2[block2].busy_block.busy_size && strcmp(type->name, "s_smx_context") != 0) + return -1; + } - }else{ /* free block */ + if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size){ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } - i++; + if(heapinfo1[block1].busy_block.busy_size != heapinfo2[block2].busy_block.busy_size){ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } + + if(!add_heap_area_pair(previous, block1, -1, block2, -1)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + + size = heapinfo1[block1].busy_block.busy_size; + + if(size <= 0){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + + frag1 = -1; + frag2 = -1; + + area1_to_compare = addr_block1; + area2_to_compare = addr_block2; + + if((heapinfo1[block1].busy_block.ignore > 0) && (heapinfo2[block2].busy_block.ignore == heapinfo1[block1].busy_block.ignore)) + check_ignore = heapinfo1[block1].busy_block.ignore; + + }else if((heapinfo1[block1].type > 0) && (heapinfo2[block2].type > 0)){ /* Fragmented block */ + + frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; + frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; + + 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(type_size != -1){ + if(heapinfo1[block1].busy_frag.frag_size[frag1] == -1 || heapinfo2[block2].busy_frag.frag_size[frag2] == -1) + return -1; + if(type_size != heapinfo1[block1].busy_frag.frag_size[frag1] || type_size != heapinfo2[block2].busy_frag.frag_size[frag2]) + return -1; + } + + if(equals_to1[block1][frag1] != NULL && equals_to2[block2][frag2] != NULL){ + if(equal_fragments(block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + } + if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ + if(type_size == -1){ + return -1; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + } + } + + 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(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; } + + if((heapinfo1[block1].busy_frag.ignore[frag1] > 0) && ( heapinfo2[block2].busy_frag.ignore[frag2] == heapinfo1[block1].busy_frag.ignore[frag1])) + check_ignore = heapinfo1[block1].busy_frag.ignore[frag1]; + + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; + + } + + + /* Start comparison*/ + if(type_id != NULL){ + res_compare = compare_heap_area_with_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, type_id, size, check_ignore, pointer_level); + if(res_compare != 0){ + if(match_pairs) + xbt_dynar_free(&previous); + return res_compare; + } + }else{ + res_compare = compare_heap_area_without_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, size, check_ignore); + if(res_compare != 0){ + if(match_pairs) + xbt_dynar_free(&previous); + return res_compare; + } } + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + + return 0; +} + +/*********************************************** Miscellaneous ***************************************************/ +/****************************************************************************************************************/ + - fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance); +int get_pointed_area_size(void *area, int heap){ - return (errors); + int block, frag; + malloc_info *heapinfo; + + if(heap == 1) + heapinfo = heapinfo1; + else + heapinfo = heapinfo2; + + block = ((char*)area - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1; + + if(((char *)area < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block > heapsize1) || (block < 1)) + return -1; + + if(heapinfo[block].type == -1){ /* Free block */ + return -1; + }else if(heapinfo[block].type == 0){ /* Complete block */ + return (int)heapinfo[block].busy_block.busy_size; + }else{ + frag = ((uintptr_t) (ADDR2UINT (area) % (BLOCKSIZE))) >> heapinfo[block].type; + return (int)heapinfo[block].busy_frag.frag_size[frag]; + } + +} + +char *get_type_description(xbt_dict_t types, char *type_name){ + + xbt_dict_cursor_t dict_cursor; + char *type_origin; + dw_type_t type; + + xbt_dict_foreach(types, dict_cursor, type_origin, type){ + if(type->name && (strcmp(type->name, type_name) == 0) && type->size > 0){ + xbt_dict_cursor_free(&dict_cursor); + return type_origin; + } + } + + xbt_dict_cursor_free(&dict_cursor); + return NULL; } -/* void *get_end_addr_heap(void *heap){ */ +#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(); -/* 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 *\/ */ + heapbase1 = (char *)heap1 + BLOCKSIZE; + heapbase2 = (char *)heap2 + BLOCKSIZE; -/* fp = fopen("/proc/self/maps", "r"); */ + 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(fp == NULL) */ -/* perror("fopen failed"); */ + heapsize1 = heap1->heapsize; + heapsize2 = heap2->heapsize; + /* Start comparison */ + size_t i, j, k; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; -/* xbt_dynar_t lfields = NULL; */ -/* xbt_dynar_t start_end = NULL; */ -/* void *start_addr; */ -/* void *end_addr; */ + int distance = 0; -/* while ((read = getline(&line, &n, fp)) != -1) { */ + /* Check busy blocks*/ -/* xbt_str_trim(line, NULL); */ -/* xbt_str_strip_spaces(line); */ -/* lfields = xbt_str_split(line,NULL); */ + i = 1; -/* 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); */ + while(i <= heaplimit){ -/* 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; */ -/* } */ + 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{ -/* xbt_dynar_reset(lfields); */ -/* xbt_free(lfields); */ -/* xbt_dynar_reset(start_end); */ -/* xbt_free(start_end); */ -/* free(line); */ -/* fclose(fp); */ -/* return NULL; */ + 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 { /* 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; + +}