X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50376f845bf79ba752eb226efdeb2a46b2ff88cf..25723c478419ad1bb662b9c28155f60d3b9262eb:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index 52896d9526..23bf54dabd 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. */ @@ -129,10 +130,14 @@ static int compare_backtrace(int b1, int f1, int b2, int f2){ /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ -void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL; -malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL; -size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0; -xbt_dynar_t to_ignore1 = NULL, to_ignore2 = NULL; +typedef char* type_name; + +__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; +__thread type_name **types1, **types2; /*********************************** Free functions ************************************/ @@ -145,6 +150,11 @@ 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){ @@ -187,7 +197,7 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int b return 0; } -static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ +static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ unsigned int cursor = 0; int start = 0; @@ -205,7 +215,7 @@ static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address end = cursor - 1; } - return 0; + return -1; } static int is_stack(void *address){ @@ -241,40 +251,40 @@ static void match_equals(xbt_dynar_t list){ xbt_dynar_foreach(list, cursor, current_pair){ if(current_pair->fragment1 != -1){ - - if(heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] != NULL){ - 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(previous_area); + + 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(heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] != NULL){ - 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(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); } - 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); + 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(heapinfo1[current_pair->block1].busy_block.equal_to != NULL){ - 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(previous_area); + 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(heapinfo2[current_pair->block2].busy_block.equal_to != NULL){ - 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(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); } - 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); + 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); } @@ -282,26 +292,27 @@ static void match_equals(xbt_dynar_t list){ } static int equal_blocks(int b1, int b2){ - if(heapinfo1[b1].busy_block.equal_to != NULL){ - if(heapinfo2[b2].busy_block.equal_to != NULL){ - if(((heap_area_t)(heapinfo1[b1].busy_block.equal_to))->block == b2 && ((heap_area_t)(heapinfo2[b2].busy_block.equal_to))->block == b1) - return 1; - } - } + + 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(heapinfo1[b1].busy_frag.equal_to[f1] != NULL){ - if(heapinfo2[b2].busy_frag.equal_to[f2] != NULL){ - if(((heap_area_t)(heapinfo1[b1].busy_frag.equal_to[f1]))->block == b2 && ((heap_area_t)(heapinfo2[b2].busy_frag.equal_to[f2]))->block == b1 && ((heap_area_t)(heapinfo1[b1].busy_frag.equal_to[f1]))->fragment == f2 && ((heap_area_t)(heapinfo2[b2].busy_frag.equal_to[f2]))->fragment == f1) - return 1; - } - } + + 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; } -void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){ +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; @@ -319,6 +330,34 @@ void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, 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; j 0){ - for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){ - xbt_free(heapinfo1[i].busy_frag.equal_to[j]); - heapinfo1[i].busy_frag.equal_to[j] = NULL; - } + for(i=0; i 0){ - for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){ - xbt_free(heapinfo2[i].busy_frag.equal_to[j]); - heapinfo2[i].busy_frag.equal_to[j] = NULL; - } - } - i++; - } + free(equals_to1); + free(equals_to2); + free(types1); + free(types2); s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL; heapinfo1 = NULL, heapinfo2 = NULL; heaplimit = 0, heapsize1 = 0, heapsize2 = 0; to_ignore1 = NULL, to_ignore2 = NULL; + equals_to1 = NULL, equals_to2 = NULL; + types1 = NULL, types2 = NULL; } int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ - if(heap1 == NULL && heap1 == NULL){ + if(heap1 == NULL && heap2 == NULL){ XBT_DEBUG("Malloc descriptors null"); return 0; } - if(heap1->heaplimit != heap2->heaplimit){ - XBT_DEBUG("Different limit of valid info table indices"); - return 1; - } - /* Start comparison */ size_t i1, i2, j1, j2, k; - size_t current_block = -1; /* avoid "maybe uninitialized" warning */ - size_t current_fragment; void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; int nb_diff1 = 0, nb_diff2 = 0; @@ -404,8 +436,6 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ while(i1 <= heaplimit){ - current_block = i1; - if(heapinfo1[i1].type == -1){ /* Free block */ i1++; continue; @@ -417,14 +447,14 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ if(is_stack(addr_block1)){ for(k=0; k < heapinfo1[i1].busy_block.size; k++) - heapinfo1[i1+k].busy_block.equal_to = new_heap_area(i1, -1); + equals_to1[i1+k][0] = new_heap_area(i1, -1); for(k=0; k < heapinfo2[i1].busy_block.size; k++) - heapinfo2[i1+k].busy_block.equal_to = new_heap_area(i1, -1); - i1 = i1 + heapinfo1[current_block].busy_block.size; + equals_to2[i1+k][0] = new_heap_area(i1, -1); + i1 += heapinfo1[i1].busy_block.size; continue; } - if(heapinfo1[i1].busy_block.equal_to != NULL){ + if(equals_to1[i1][0] != NULL){ i1++; continue; } @@ -434,21 +464,21 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ res_compare = 0; /* Try first to associate to same block in the other heap */ - if(heapinfo2[current_block].type == heapinfo1[current_block].type){ + if(heapinfo2[i1].type == heapinfo1[i1].type){ - if(heapinfo2[current_block].busy_block.equal_to == NULL){ - - addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + 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); /*FIXME*/ + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 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); + if(res_compare != 1){ + 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 = i1 + heapinfo1[current_block].busy_block.size; + i1 += heapinfo1[i1].busy_block.size; } xbt_dynar_reset(previous); @@ -461,7 +491,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - if(i2 == current_block){ + if(i2 == i1){ i2++; continue; } @@ -470,21 +500,21 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i2++; continue; } - - if(heapinfo2[i2].busy_block.equal_to != NULL){ + + if(equals_to2[i2][0] != NULL){ i2++; continue; } - res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); /*FIXME */ + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); - if(res_compare == 0){ + if(res_compare != 1 ){ for(k=1; k < heapinfo2[i2].busy_block.size; k++) - heapinfo2[i2+k].busy_block.equal_to = new_heap_area(i1, -1); + equals_to2[i2+k][0] = 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); + equals_to1[i1+k][0] = new_heap_area(i2, -1); equal = 1; - i1 = i1 + heapinfo1[i1].busy_block.size; + i1 += heapinfo1[i1].busy_block.size; } xbt_dynar_reset(previous); @@ -504,12 +534,10 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){ - current_fragment = j1; - if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */ continue; - if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL) + if(equals_to1[i1][j1] != NULL) continue; addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].type)); @@ -518,16 +546,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ equal = 0; /* Try first to associate to same fragment in the other heap */ - if(heapinfo2[current_block].type == heapinfo1[current_block].type){ + if(heapinfo2[i1].type == heapinfo1[i1].type){ - if(heapinfo2[current_block].busy_frag.equal_to[current_fragment] == NULL){ - - addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - addr_frag2 = (void*) ((char *)addr_block2 + (current_fragment << ((xbt_mheap_t)s_heap)->heapinfo[current_block].type)); + 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); /*FIXME*/ + res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); - if(res_compare == 0) + if(res_compare != 1) equal = 1; xbt_dynar_reset(previous); @@ -538,7 +566,6 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ while(i2 <= heaplimit && !equal){ - if(heapinfo2[i2].type <= 0){ i2++; continue; @@ -546,18 +573,18 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){ - if(i2 == current_block && j2 == current_fragment) + if(i2 == i1 && j2 == j1) + continue; + + if(equals_to2[i2][j2] != NULL) continue; - - if(heapinfo2[i2].busy_frag.equal_to[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)); + 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); /*FIXME*/ + res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); - if(res_compare == 0){ + if(res_compare != 1){ equal = 1; xbt_dynar_reset(previous); break; @@ -571,8 +598,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ } - if(heapinfo1[i1].busy_frag.equal_to[j1] == NULL){ - XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p, ignore %d)\n", i1, j1, heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1, heapinfo1[i1].busy_frag.ignore[j1]); + 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++; @@ -593,9 +620,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ while(i<=heaplimit){ if(heapinfo1[i].type == 0){ - if(current_block == heaplimit){ + if(i1 == heaplimit){ if(heapinfo1[i].busy_block.busy_size > 0){ - if(heapinfo1[i].busy_block.equal_to == NULL){ + 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); @@ -610,9 +637,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ 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(current_block == heaplimit){ + if(i1== heaplimit){ if(heapinfo1[i].busy_frag.frag_size[j] > 0){ - if(heapinfo1[i].busy_frag.equal_to[j] == NULL){ + 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)); @@ -628,16 +655,16 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i++; } - if(current_block == heaplimit) + if(i1 == heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); i = 1; while(i<=heaplimit){ if(heapinfo2[i].type == 0){ - if(current_block == heaplimit){ + if(i1 == heaplimit){ if(heapinfo2[i].busy_block.busy_size > 0){ - if(heapinfo2[i].busy_block.equal_to == NULL){ + 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); @@ -652,9 +679,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ 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(current_block == heaplimit){ + if(i1 == heaplimit){ if(heapinfo2[i].busy_frag.frag_size[j] > 0){ - if(heapinfo2[i].busy_frag.equal_to[j] == NULL){ + 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)); @@ -670,7 +697,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ i++; } - if(current_block == heaplimit) + if(i1 == heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); xbt_dynar_free(&previous); @@ -688,11 +715,16 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo while(i 0){ - if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)real_area1 + i)) > 0){ + if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)real_area1 + i)) != -1){ if((ignore2 = heap_comparison_ignore_size(to_ignore2, (char *)real_area2 + i)) == ignore1){ - i = i + ignore2; - check_ignore--; - continue; + if(ignore1 == 0){ + check_ignore--; + return 0; + }else{ + i = i + ignore2; + check_ignore--; + continue; + } } } } @@ -709,7 +741,7 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo }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 != 0){ + if(res_compare == 1){ return res_compare; } i = pointer_align + sizeof(void *); @@ -738,8 +770,9 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void 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)) + 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; @@ -751,20 +784,20 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void 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){ /* Chaine de caractères, donc taille aléatoire */ - return (memcmp(area1, area2, area_size) != 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); + 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 @@ -813,12 +846,12 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void return 0; break; } - for(i=0; isize; i++){ + 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 != 0) + if(res == 1) return res; } break; @@ -830,14 +863,14 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void }else{ pointer_level++; if(pointer_level > 1){ /* Array of pointers */ - for(i=0; i<(area_size/sizeof(void *)); i++){ + 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 != 0) + if(res == 1) return res; } }else{ @@ -862,12 +895,12 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } 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++){ + 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 != 0) + if(res == 1) return res; } }else{ @@ -875,19 +908,18 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } }else{ cursor = 0; - xbt_dynar_foreach(type->members, cursor, member){ + 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 != 0) - return res; + 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; 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: @@ -901,6 +933,41 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } +static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xbt_dict_t other_types, int area_size){ + dw_type_t type = xbt_dict_get_or_null(all_types, type_id); + char* type_desc; + switch(type->type){ + 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)); + } + } + if(area_size != -1 && type->size != area_size){ + if(area_size>type->size && area_size%type->size == 0) + return type_id; + else + return NULL; + }else{ + unsigned int cursor = 0; + dw_type_t member; + xbt_dynar_foreach(type->members, cursor, member){ + if(member->offset == offset) + return member->dw_type_id; + } + return NULL; + } + break; + default: + /* FIXME : other cases ? */ + return NULL; + break; + } +} + 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){ int res_compare; @@ -908,8 +975,14 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t ssize_t size; int check_ignore = 0; - void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2; void *area1_to_compare, *area2_to_compare; + dw_type_t type = NULL; + char *type_desc; + int type_size = -1; + int offset1 =0, offset2 = 0; + int new_size1 = -1, new_size2 = -1; + char *new_type_id1 = NULL, *new_type_id2 = NULL; int match_pairs = 0; @@ -939,127 +1012,190 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)heapbase1)); addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)heapbase2)); - - if(heapinfo1[block1].type == heapinfo2[block2].type){ - - if(heapinfo1[block1].type == -1){ /* Free block */ - if(match_pairs){ - match_equals(previous); - xbt_dynar_free(&previous); - } - return 0; - }else if(heapinfo1[block1].type == 0){ /* Complete block */ + real_addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + real_addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); - if(heapinfo1[block1].busy_block.equal_to != NULL && heapinfo2[block2].busy_block.equal_to != NULL){ - if(equal_blocks(block1, block2)){ - if(match_pairs){ - match_equals(previous); - xbt_dynar_free(&previous); - } - return 0; - } + 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(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size){ + 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 1; + return 0; } + } - if(heapinfo1[block1].busy_block.busy_size != heapinfo2[block2].busy_block.busy_size){ - if(match_pairs){ - xbt_dynar_free(&previous); - } - return 1; + 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")) + return -1; + } + + if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.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; + 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; + size = heapinfo1[block1].busy_block.busy_size; + + if(type_id != NULL){ + free(types1[block1][0]); + free(types2[block2][0]); + types1[block1][0] = strdup(type_id); + types2[block2][0] = strdup(type_id); + } - if(size <= 0){ - if(match_pairs){ - match_equals(previous); - xbt_dynar_free(&previous); - } - return 0; + if(size <= 0){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); } + return 0; + } - frag1 = -1; - frag2 = -1; + frag1 = -1; + frag2 = -1; - area1_to_compare = addr_block1; - area2_to_compare = addr_block2; + 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; + 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{ /* Frgamented block */ + }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(heapinfo1[block1].busy_frag.equal_to[frag1] != NULL && heapinfo2[block2].busy_frag.equal_to[frag2] != NULL){ - if(equal_fragments(block1, frag1, block2, frag2)){ - if(match_pairs){ - match_equals(previous); - xbt_dynar_free(&previous); - } - return 0; - } - } + frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; + frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; - if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ - if(match_pairs){ - xbt_dynar_free(&previous); - } - return 1; - } - - if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ + addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << heapinfo1[block1].type)); + addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << heapinfo2[block2].type)); + + real_addr_frag1 = (void*) ((char *)real_addr_block1 + (frag1 << ((xbt_mheap_t)s_heap)->heapinfo[block1].type)); + real_addr_frag2 = (void*) ((char *)real_addr_block2 + (frag2 << ((xbt_mheap_t)s_heap)->heapinfo[block1].type)); + + 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; } + } - size = heapinfo1[block1].busy_frag.frag_size[frag1]; - - if(size <= 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){ - match_equals(previous); xbt_dynar_free(&previous); } - return 0; + return 1; } + } - 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]; - + size = heapinfo1[block1].busy_frag.frag_size[frag1]; + + if(type_id != NULL){ + free(types1[block1][frag1]); + free(types2[block2][frag2]); + types1[block1][frag1] = strdup(type_id); + types2[block2][frag2] = strdup(type_id); } - }else if((heapinfo1[block1].type > 0) && (heapinfo2[block2].type > 0)){ + if(real_addr_frag1 != area1 || real_addr_frag2 != area2){ + offset1 = (char *)area1 - (char *)real_addr_frag1; + offset2 = (char *)area2 - (char *)real_addr_frag2; + if(types1[block1][frag1] != NULL && types2[block2][frag2] != NULL){ + new_type_id1 = get_offset_type(types1[block1][frag1], offset1, all_types, other_types, size); + new_type_id2 = get_offset_type(types2[block2][frag2], offset1, all_types, other_types, size); + }else if(types1[block1][frag1] != NULL){ + new_type_id1 = get_offset_type(types1[block1][frag1], offset1, all_types, other_types, size); + new_type_id2 = get_offset_type(types1[block1][frag1], offset2, all_types, other_types, size); + }else if(types2[block2][frag2] != NULL){ + new_type_id1 = get_offset_type(types2[block2][frag2], offset1, all_types, other_types, size); + new_type_id2 = get_offset_type(types2[block2][frag2], offset2, all_types, other_types, size); + }else{ + return -1; + } + + if(new_type_id1 != NULL && new_type_id2 != NULL && !strcmp(new_type_id1, new_type_id2)){ + type = xbt_dict_get_or_null(all_types, new_type_id1); + while(type->size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + new_size1 = type->size; + type = xbt_dict_get_or_null(all_types, new_type_id2); + while(type->size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + new_size2 = type->size; + }else{ + return -1; + } + } - frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; - frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; + area1_to_compare = (char *)addr_frag1 + offset1; + area2_to_compare = (char *)addr_frag2 + offset2; + + if(new_size1 > 0 && new_size1 == new_size2){ + type_id = new_type_id1; + size = new_size1; + } - if(heapinfo1[block1].busy_frag.equal_to[frag1] != NULL || heapinfo2[block2].busy_frag.equal_to[frag2] != NULL){ - if(equal_fragments(block1, frag1, block2, frag2)){ + if(offset1 == 0 && offset2 == 0){ + if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ if(match_pairs){ match_equals(previous); xbt_dynar_free(&previous); @@ -1068,29 +1204,6 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } } - if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ - 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; - } - - 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; - - size = heapinfo1[block1].busy_frag.frag_size[frag1]; - if(size <= 0){ if(match_pairs){ match_equals(previous); @@ -1098,33 +1211,35 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } 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]; + + 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(res_compare == 1){ 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(res_compare == 1){ + if(match_pairs) + xbt_dynar_free(&previous); + return res_compare; + } } if(match_pairs){