X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/849ebc4004f97372ab9df109e542198c1bf5d694..f8db3884110dda1330177a0b6b76a3dc47154244:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index 1399808a33..b019d5b95c 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -8,37 +8,38 @@ #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; -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; +xbt_dynar_t mc_heap_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 compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous); -static void match_equals(xbt_dynar_t list); +static int in_mc_comparison_ignore(int block, int fragment); +static size_t heap_comparison_ignore_size(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 size_t heap_comparison_ignore(void *address); +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) { - XBT_DEBUG("No backtrace available for that block, sorry."); + fprintf(stderr, "No backtrace available for that block, sorry.\n"); return; } @@ -47,15 +48,15 @@ void mmalloc_backtrace_block_display(void* heapinfo, int block){ xbt_ex_setup_backtrace(&e); if (e.used == 0) { - XBT_DEBUG("(backtrace not set)"); + fprintf(stderr, "(backtrace not set)\n"); } else if (e.bt_strings == NULL) { - XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); + fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); } else { int i; - XBT_DEBUG("Backtrace of where the block %d was malloced (%d frames):", block ,e.used); + 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" */{ - XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4); + fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); } } @@ -70,25 +71,59 @@ void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){ xbt_ex_setup_backtrace(&e); if (e.used == 0) { - XBT_DEBUG("(backtrace not set)"); + fprintf(stderr, "(backtrace not set)\n"); } else if (e.bt_strings == NULL) { - XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); + fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); } else { int i; - XBT_DEBUG("Backtrace of where the fragment %d in block %d was malloced (%d frames):", frag, block ,e.used); + 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" */{ - XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4); + fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); + } + } + +} + +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; } } -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){ +void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL; +malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL; +size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0; + +int ignore_done = 0; + +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"); @@ -100,6 +135,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ return 1; } + if(heap1->heapstats.chunks_used != heap2->heapstats.chunks_used){ + XBT_DEBUG("Different number of chunks used in heap : %zu - %zu", heap1->heapstats.chunks_used, heap2->heapstats.chunks_used); + return 1; + } + /* Heap information */ heaplimit = ((struct mdesc *)heap1)->heaplimit; @@ -115,22 +155,51 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ heapsize2 = heap2->heapsize; /* Start comparison */ - size_t i1, i2, j1, j2, k; + size_t i1, i2, j1, j2, k, current_block, current_fragment; void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; - size_t frag_size1, frag_size2; + void *real_addr_block1, *real_addr_block2; + char *stack_name; xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); - int equal; + int equal, res_compare; + + /* Init equal information */ + i1 = 1; + + while(i1<=heaplimit){ + if(heapinfo1[i1].type == 0){ + heapinfo1[i1].busy_block.equal_to = NULL; + } + if(heapinfo1[i1].type > 0){ + for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ + heapinfo1[i1].busy_frag.equal_to[j1] = NULL; + } + } + i1++; + } + + i2 = 1; + + while(i2<=heaplimit){ + if(heapinfo2[i2].type == 0){ + heapinfo2[i2].busy_block.equal_to = NULL; + } + if(heapinfo2[i2].type > 0){ + for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ + heapinfo2[i2].busy_frag.equal_to[j2] = NULL; + } + } + i2++; + } /* Check busy blocks*/ i1 = 1; - while(i1 < heaplimit){ + while(i1 <= heaplimit){ - i2 = 1; - equal = 0; + current_block = i1; if(heapinfo1[i1].type == -1){ /* Free block */ i1++; @@ -138,17 +207,102 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ } 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[i1].busy_block.busy_size == 0){ + i1++; + continue; + } + + 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_heap_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); + + } + + } + + } 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; } - if(heapinfo2[i2].busy_block.equal_to == 1){ + if(heapinfo2[i2].busy_block.equal_to != NULL){ i2++; continue; } @@ -163,69 +317,128 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ 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; + + if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){ + if(in_mc_comparison_ignore((int)i1, -1)) + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 1); + else + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0); + }else{ + res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0); + } + + if(res_compare == 0){ + for(k=1; k < heapinfo2[i2].busy_block.size; k++) + heapinfo2[i2+k].busy_block.equal_to = new_heap_area(i1, -1); + for(k=1; k < heapinfo1[i1].busy_block.size; k++) + heapinfo1[i1+k].busy_block.equal_to = new_heap_area(i2, -1); equal = 1; - match_equals(previous); + match_equals(previous, equals); + i1 = i1 + heapinfo1[i1].busy_block.size; } + xbt_dynar_reset(previous); i2++; } + if(!equal) + i1++; + }else{ /* Fragmented block */ - frag_size1 = 1 << heapinfo1[i1].type; - for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ - if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */ + current_fragment = j1; + + if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ continue; - - addr_frag1 = (void*) ((char *)addr_block1 + (j1 * frag_size1)); - + + if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL) + continue; + + addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].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(ignore_done < xbt_dynar_length(mc_heap_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{ + res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0); + } + + if(res_compare == 0){ + equal = 1; + match_equals(previous, equals); + } + + xbt_dynar_reset(previous); + + } + + } + + } + while(i2 <= heaplimit && !equal){ + if(heapinfo2[i2].type <= 0){ i2++; continue; } - - frag_size2 = 1 << heapinfo2[i2].type; for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ - if(heapinfo2[i2].busy_frag.equal_to[j2] == 1){ + if(heapinfo2[i2].type == heapinfo1[i1].type && i2 == current_block && j2 == current_fragment) + continue; + + if(heapinfo2[i2].busy_frag.equal_to[j2] != NULL) continue; - } - if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]){ /* Different size_used */ + 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)); + addr_frag2 = (void*) ((char *)addr_block2 + (j2 << heapinfo2[i2].type)); /* 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; + + if(ignore_done < xbt_dynar_length(mc_heap_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); + match_equals(previous, equals); break; } + xbt_dynar_reset(previous); } @@ -236,42 +449,44 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ } + i1++; + } - i1++; - } /* 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(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++; + }else{ + xbt_free(heapinfo1[i].busy_block.equal_to); } } } if(heapinfo1[i].type > 0){ - frag_size = 1 << heapinfo1[i].type; + 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] == -1){ + if(heapinfo1[i].busy_frag.equal_to[j] == NULL){ 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)); + 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++; + }else{ + xbt_free(heapinfo1[i].busy_frag.equal_to[j]); } } } @@ -280,35 +495,38 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i++; } - XBT_DEBUG("Different blocks or fragments in heap1 : %d\n", nb_diff1); + XBT_DEBUG("Different blocks or fragments in heap1 : %d", nb_diff1); i = 1; while(i 0){ - if(heapinfo2[i].busy_block.equal_to == -1){ + 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++; + }else{ + xbt_free(heapinfo2[i].busy_block.equal_to); } } } if(heapinfo2[i].type > 0){ - frag_size = 1 << heapinfo2[i].type; + 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] == -1){ + if(heapinfo2[i].busy_frag.equal_to[j] == NULL){ 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)); + 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++; + }else{ + xbt_free(heapinfo2[i].busy_frag.equal_to[j]); } } } @@ -316,73 +534,96 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i++; } - XBT_DEBUG("Different blocks or fragments in heap2 : %d\n", nb_diff2); - - - /* Reset equal information */ - i = 1; + XBT_DEBUG("Different blocks or fragments in heap2 : %d", nb_diff2); - while(i 0){ - for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){ - heapinfo1[i].busy_frag.equal_to[j] = -1; - } - } - i++; - } + xbt_dynar_free(&previous); + ignore_done = 0; + s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL; + heapinfo1 = NULL, heapinfo2 = NULL; + heaplimit = 0, heapsize1 = 0, heapsize2 = 0; - i = 1; + return ((nb_diff1 > 0) || (nb_diff2 > 0)); - while(i 0){ - for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){ - heapinfo2[i].busy_frag.equal_to[j] = -1; - } +} + +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 in_mc_comparison_ignore(int block, int fragment){ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + mc_heap_ignore_region_t region; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); + if(region->block == block){ + if(region->fragment == fragment) + return 1; + if(region->fragment < fragment) + start = cursor + 1; + if(region->fragment > fragment) + end = cursor - 1; } - i++; + if(region->block < block) + start = cursor + 1; + if(region->block > block) + end = cursor - 1; } - xbt_dynar_free(&previous); - - return ((nb_diff1 > 0) || (nb_diff2 > 0)); - + return 0; } -static size_t heap_comparison_ignore(void *address){ +static size_t heap_comparison_ignore_size(void *address){ unsigned int cursor = 0; - mc_ignore_region_t region; - xbt_dynar_foreach(mmalloc_ignore, cursor, region){ + int start = 0; + int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + mc_heap_ignore_region_t region; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); if(region->address == address) return region->size; + if(region->address < address) + start = cursor + 1; + if(region->address > address) + end = cursor - 1; } + return 0; } -static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous){ +static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous, int check_ignore){ 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, frag_size1, frag_size2; 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(check_ignore){ + + current_area1 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area1) + i) - (char *)heapbase1); + if((ignore1 = heap_comparison_ignore_size(current_area1)) > 0){ + current_area2 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area2) + i) - (char *)heapbase2); + if((ignore2 = heap_comparison_ignore_size(current_area2)) == ignore1){ + i = i + ignore2; + ignore_done++; + continue; + } } + } if(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){ @@ -416,33 +657,45 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ } if(add_heap_area_pair(previous, block_pointed1, -1, block_pointed2, -1)){ + + if(ignore_done < xbt_dynar_length(mc_heap_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); + } - res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous); - - if(res_compare) + if(res_compare == 1) return 1; } }else{ /* Fragmented block */ - /* Get pointed fragments number */ + /* 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; - - 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)); + 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)){ - res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous); - - if(res_compare) + if(ignore_done < xbt_dynar_length(mc_heap_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; } @@ -459,20 +712,24 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ 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 */ + if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */ return 1; - - frag_size1 = 1 << heapinfo1[block_pointed1].type; - frag_size2 = 1 << heapinfo1[block_pointed2].type; - addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 * frag_size1)); - addr_frag_pointed2 = (void*) ((char *)addr_block_pointed2 + (frag_pointed2 * frag_size2)); + 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)){ - res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous); + if(ignore_done < xbt_dynar_length(mc_heap_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) + if(res_compare == 1) return 1; } @@ -540,20 +797,334 @@ static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, in return 1; } -static void match_equals(xbt_dynar_t list){ +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){ - heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = 1; - heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = 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{ - heapinfo1[current_pair->block1].busy_block.equal_to = 1; - heapinfo2[current_pair->block2].busy_block.equal_to = 1; + + 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 { /* 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; +} + +static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2){ + + if(xbt_dynar_is_empty(*equals)){ + + heap_equality_t he = xbt_new0(s_heap_equality_t, 1); + he->address1 = a1; + he->address2 = a2; + + 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; + } + + heap_equality_t he = xbt_new0(s_heap_equality_t, 1); + he->address1 = a1; + he->address2 = a2; + + if(current_equality->address1 < a1) + xbt_dynar_insert_at(*equals, cursor + 1 , &he); + else + xbt_dynar_insert_at(*equals, cursor, &he); + + } + +} + +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){ + + int start = 0; + int end = xbt_dynar_length(*equals) - 1; + + + 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{ + + 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); + + } + + +} + +int is_free_area(void *area, xbt_mheap_t heap){ + + 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; + + /* 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; + + 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; + + + +}