X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/abe361354c941e1725e122f12a1bcce332a5a716..f8db3884110dda1330177a0b6b76a3dc47154244:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index ac7fe3584d..b019d5b95c 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt, extern char *xbt_binary_name; -xbt_dynar_t mmalloc_ignore; +xbt_dynar_t mc_heap_comparison_ignore; xbt_dynar_t stacks_areas; static void heap_area_pair_free(heap_area_pair_t pair); @@ -27,8 +27,8 @@ static heap_area_t new_heap_area(int block, int fragment); static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous, int check_ignore); static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals); -static int in_mmalloc_ignore(int block, int fragment); -static size_t heap_comparison_ignore(void *address); +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); @@ -39,7 +39,7 @@ 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; } @@ -48,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); } } @@ -71,26 +71,57 @@ 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 ignore_done; +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){ @@ -104,6 +135,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac 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; @@ -123,27 +159,20 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; void *real_addr_block1, *real_addr_block2; char *stack_name; - int nb_block1=0, nb_frag1=0, nb_block2=0, nb_frag2=0; xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); int equal, res_compare; - ignore_done = 0; - /* Init equal information */ i1 = 1; while(i1<=heaplimit){ if(heapinfo1[i1].type == 0){ - if(heapinfo1[i1].busy_block.busy_size > 0) - nb_block1++; heapinfo1[i1].busy_block.equal_to = NULL; } if(heapinfo1[i1].type > 0){ for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ - if(heapinfo1[i1].busy_frag.frag_size[j1] > 0) - nb_frag1++; heapinfo1[i1].busy_frag.equal_to[j1] = NULL; } } @@ -154,25 +183,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac while(i2<=heaplimit){ if(heapinfo2[i2].type == 0){ - if(heapinfo2[i2].busy_block.busy_size > 0) - nb_block2++; heapinfo2[i2].busy_block.equal_to = NULL; } if(heapinfo2[i2].type > 0){ for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ - if(heapinfo2[i2].busy_frag.frag_size[j2] > 0) - nb_frag2++; heapinfo2[i2].busy_frag.equal_to[j2] = NULL; } } i2++; } - if(nb_block1 != nb_block2 || nb_frag1 != nb_frag2){ - XBT_DEBUG("Different number of busy blocks (%d - %d) or busy fragments (%d - %d)", nb_block1, nb_block2, nb_frag1, nb_frag2); - return 1; - } - /* Check busy blocks*/ i1 = 1; @@ -204,11 +224,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac continue; } - if(heapinfo1[i1].busy_block.equal_to != NULL){ + if(heapinfo1[i1].busy_block.equal_to != NULL){ i1++; continue; } - + i2 = 1; equal = 0; @@ -220,7 +240,6 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac 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){ @@ -233,8 +252,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac add_heap_area_pair(previous, current_block, -1, current_block, -1); - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore((int)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); @@ -262,8 +281,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac while(i2 <= heaplimit && !equal){ - addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2)); - + 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){ @@ -302,8 +320,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac /* Comparison */ add_heap_area_pair(previous, i1, -1, i2, -1); - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore((int)i1, -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); @@ -336,10 +354,10 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac current_fragment = j1; - if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */ + if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ continue; - - if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL) + + if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL) continue; addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].type)); @@ -359,8 +377,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment); - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore((int)current_block, (int)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); @@ -406,8 +424,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac /* Comparison */ add_heap_area_pair(previous, i1, j1, i2, j2); - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore((int)i1, (int)j1)) + 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); @@ -451,6 +469,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac mmalloc_backtrace_block_display((void*)heapinfo1, i); } nb_diff1++; + }else{ + xbt_free(heapinfo1[i].busy_block.equal_to); } } } @@ -465,6 +485,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j); } nb_diff1++; + }else{ + xbt_free(heapinfo1[i].busy_frag.equal_to[j]); } } } @@ -487,6 +509,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac mmalloc_backtrace_block_display((void*)heapinfo2, i); } nb_diff2++; + }else{ + xbt_free(heapinfo2[i].busy_block.equal_to); } } } @@ -501,6 +525,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j); } nb_diff2++; + }else{ + xbt_free(heapinfo2[i].busy_frag.equal_to[j]); } } } @@ -511,7 +537,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac XBT_DEBUG("Different blocks or fragments in heap2 : %d", nb_diff2); xbt_dynar_free(&previous); - + ignore_done = 0; + s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL; + heapinfo1 = NULL, heapinfo2 = NULL; + heaplimit = 0, heapsize1 = 0, heapsize2 = 0; + return ((nb_diff1 > 0) || (nb_diff2 > 0)); } @@ -524,16 +554,16 @@ static heap_area_t new_heap_area(int block, int fragment){ return area; } -static int in_mmalloc_ignore(int block, int fragment){ +static int in_mc_comparison_ignore(int block, int fragment){ unsigned int cursor = 0; int start = 0; - int end = xbt_dynar_length(mmalloc_ignore) - 1; - mc_ignore_region_t region; + 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_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t); + 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; @@ -551,15 +581,15 @@ static int in_mmalloc_ignore(int block, int fragment){ return 0; } -static size_t heap_comparison_ignore(void *address){ +static size_t heap_comparison_ignore_size(void *address){ unsigned int cursor = 0; int start = 0; - int end = xbt_dynar_length(mmalloc_ignore) - 1; - mc_ignore_region_t region; + 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_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t); + 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) @@ -585,9 +615,9 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ if(check_ignore){ current_area1 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area1) + i) - (char *)heapbase1); - if((ignore1 = heap_comparison_ignore(current_area1)) > 0){ + 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(current_area2)) == ignore1){ + if((ignore2 = heap_comparison_ignore_size(current_area2)) == ignore1){ i = i + ignore2; ignore_done++; continue; @@ -628,8 +658,8 @@ 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(mmalloc_ignore)){ - if(in_mmalloc_ignore(block_pointed1, -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); @@ -656,8 +686,8 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){ - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore(block_pointed1, frag_pointed1)) + 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); @@ -690,8 +720,8 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){ - if(ignore_done < xbt_dynar_length(mmalloc_ignore)){ - if(in_mmalloc_ignore(block_pointed1, frag_pointed1)) + 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); @@ -979,12 +1009,12 @@ static char * is_stack(void *address){ static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2){ - heap_equality_t he = xbt_new0(s_heap_equality_t, 1); - he->address1 = a1; - he->address2 = a2; - if(xbt_dynar_is_empty(*equals)){ + 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{ @@ -1010,6 +1040,10 @@ static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2){ 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);