#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 mc_heap_comparison_ignore;
+xbt_dynar_t stacks_areas;
+void *maestro_stack_start, *maestro_stack_end;
+
+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 size_t heap_comparison_ignore_size(xbt_dynar_t list, 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 int is_stack(void *address);
+static int is_block_stack(int block);
+static int equal_blocks(int b1, int b2);
+static int equal_fragments(int b1, int f1, int b2, int f2);
+
+void mmalloc_backtrace_block_display(void* heapinfo, int block){
+
+ /* xbt_ex_t e; */
+
+ /* if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) { */
+ /* fprintf(stderr, "No backtrace available for that block, sorry.\n"); */
+ /* return; */
+ /* } */
+
+ /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE); */
+ /* e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size; */
+
+ /* xbt_ex_setup_backtrace(&e); */
+ /* if (e.used == 0) { */
+ /* fprintf(stderr, "(backtrace not set)\n"); */
+ /* } else if (e.bt_strings == NULL) { */
+ /* fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */
+ /* } else { */
+ /* int i; */
+
+ /* fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used); */
+ /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */
+ /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */
+ /* } */
+ /* } */
+}
+
+void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){
+
+ /* xbt_ex_t e; */
+
+ /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE); */
+ /* e.used = XBT_BACKTRACE_SIZE; */
+
+ /* xbt_ex_setup_backtrace(&e); */
+ /* if (e.used == 0) { */
+ /* fprintf(stderr, "(backtrace not set)\n"); */
+ /* } else if (e.bt_strings == NULL) { */
+ /* fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */
+ /* } else { */
+ /* int i; */
+
+ /* fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used); */
+ /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */
+ /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */
+ /* } */
+ /* } */
+
+}
+
+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 = 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;
+
+void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){
+
+ heaplimit = ((struct mdesc *)heap1)->heaplimit;
+
+ s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
+
+ heapbase1 = (char *)heap1 + BLOCKSIZE;
+ heapbase2 = (char *)heap2 + BLOCKSIZE;
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
- size_t block = BLOCK(ptr);
- int type;
- xbt_ex_t e;
+ heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)((struct mdesc *)heap1)->heapinfo - (char *)s_heap)));
+ heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)((struct mdesc *)heap2)->heapinfo - (char *)s_heap)));
- if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
- fprintf(stderr,"Ouch, this pointer is not mine. I cannot display its backtrace. I refuse it to death!!\n");
- abort();
+ heapsize1 = heap1->heapsize;
+ heapsize2 = heap2->heapsize;
+
+ to_ignore1 = i1;
+ to_ignore2 = i2;
+
+ if(MC_is_active()){
+ MC_ignore_data_bss(&heaplimit, sizeof(heaplimit));
+ MC_ignore_data_bss(&s_heap, sizeof(s_heap));
+ MC_ignore_data_bss(&heapbase1, sizeof(heapbase1));
+ MC_ignore_data_bss(&heapbase2, sizeof(heapbase2));
+ MC_ignore_data_bss(&heapinfo1, sizeof(heapinfo1));
+ MC_ignore_data_bss(&heapinfo2, sizeof(heapinfo2));
+ MC_ignore_data_bss(&heapsize1, sizeof(heapsize1));
+ MC_ignore_data_bss(&heapsize2, sizeof(heapsize2));
+ MC_ignore_data_bss(&to_ignore1, sizeof(to_ignore1));
+ MC_ignore_data_bss(&to_ignore2, sizeof(to_ignore2));
}
+}
- type = mdp->heapinfo[block].type;
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
- if (type != 0) {
- //fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
- return;
+ if(heap1 == NULL && heap1 == NULL){
+ XBT_DEBUG("Malloc descriptors null");
+ return 0;
}
- if (mdp->heapinfo[block].busy_block.bt_size == 0) {
- fprintf(stderr,"No backtrace available for that block, sorry.\n");
- return;
+
+ if(heap1->heaplimit != heap2->heaplimit){
+ XBT_DEBUG("Different limit of valid info table indices");
+ return 1;
}
- memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
- e.used = mdp->heapinfo[block].busy_block.bt_size;
-
- xbt_ex_setup_backtrace(&e);
- if (e.used == 0) {
- fprintf(stderr, "(backtrace not set)\n");
- } else if (e.bt_strings == NULL) {
- fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
- } else {
- int i;
-
- fprintf(stderr, "Backtrace of where the block %p was malloced (%d frames):\n",ptr,e.used);
- for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
- fprintf(stderr,"%d",i);fflush(NULL);
- fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+ /* 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;
+
+ xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
+
+ int equal, res_compare = 0;
+
+ /* Check busy blocks*/
+
+ i1 = 1;
+
+ while(i1 <= heaplimit){
+
+ current_block = i1;
+
+ if(heapinfo1[i1].type == -1){ /* Free block */
+ i1++;
+ continue;
}
- }
-}
+ addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+
+ if(heapinfo1[i1].type == 0){ /* Large block */
+
+ if(is_stack(addr_block1)){
+ for(k=0; k < heapinfo1[i1].busy_block.size; k++)
+ heapinfo1[i1+k].busy_block.equal_to = 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;
+ continue;
+ }
+
+ if(heapinfo1[i1].busy_block.equal_to != NULL){
+ i1++;
+ continue;
+ }
+
+ i2 = 1;
+ equal = 0;
+ 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[current_block].busy_block.equal_to == NULL){
+
+ addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+
+ res_compare = compare_area(addr_block1, addr_block2, previous);
+
+ 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);
+ i1 = i1 + heapinfo1[current_block].busy_block.size;
+ }
+
+ xbt_dynar_reset(previous);
+
+ }
+
+ }
+
+ while(i2 <= heaplimit && !equal){
+
+ addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+
+ if(i2 == current_block){
+ i2++;
+ continue;
+ }
+
+ if(heapinfo2[i2].type != 0){
+ i2++;
+ continue;
+ }
+
+ if(heapinfo2[i2].busy_block.equal_to != NULL){
+ i2++;
+ continue;
+ }
+
+ res_compare = compare_area(addr_block1, addr_block2, previous);
+
+ 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);
+ i1 = i1 + heapinfo1[i1].busy_block.size;
+ }
+
+ xbt_dynar_reset(previous);
+
+ i2++;
+
+ }
+
+ if(!equal){
+ XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, heapinfo1[i1].busy_block.busy_size, addr_block1);
+ i1 = heaplimit + 1;
+ nb_diff1++;
+ }
+
+ }else{ /* Fragmented block */
+
+ for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){
-void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
+ current_fragment = j1;
- int type;
- xbt_ex_t e;
+ if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */
+ continue;
- type = mdp->heapinfo[block].type;
+ 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){
+
+ 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));
+
+ res_compare = compare_area(addr_frag1, addr_frag2, previous);
+
+ if(res_compare == 0){
+ equal = 1;
+ match_equals(previous);
+ }
+
+ xbt_dynar_reset(previous);
+
+ }
+ }
+
+ while(i2 <= heaplimit && !equal){
+
+
+ if(heapinfo2[i2].type <= 0){
+ i2++;
+ continue;
+ }
+
+ for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){
+
+ if(heapinfo2[i2].type == heapinfo1[i1].type && i2 == current_block && j2 == current_fragment)
+ 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));
+
+ res_compare = compare_area(addr_frag1, addr_frag2, previous);
+
+ if(res_compare == 0){
+ equal = 1;
+ match_equals(previous);
+ xbt_dynar_reset(previous);
+ break;
+ }
+
+ xbt_dynar_reset(previous);
+
+ }
+
+ i2++;
+
+ }
+
+ if(heapinfo1[i1].busy_frag.equal_to[j1] == NULL){
+ XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p, ignore %d)", i1, j1, heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1, heapinfo1[i1].busy_frag.ignore[j1]);
+ i2 = heaplimit + 1;
+ i1 = heaplimit + 1;
+ nb_diff1++;
+ break;
+ }
+
+ }
+
+ i1++;
+
+ }
- if (type != 0) {
- fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
- return;
}
- if (mdp->heapinfo[block].busy_block.bt_size == 0) {
- fprintf(stderr,"No backtrace available for that block, sorry.\n");
- return;
+
+ /* All blocks/fragments are equal to another block/fragment ? */
+ size_t i = 1, j = 0;
+ void *real_addr_frag1 = NULL, *real_addr_block1 = NULL, *real_addr_block2 = NULL, *real_addr_frag2 = NULL;
+
+ while(i<=heaplimit){
+ if(heapinfo1[i].type == 0){
+ if(current_block == heaplimit){
+ if(heapinfo1[i].busy_block.busy_size > 0){
+ 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++;
+ }
+ }
+ }
+ }
+ if(heapinfo1[i].type > 0){
+ addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
+ real_addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)s_heap)->heapbase));
+ for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){
+ if(current_block == heaplimit){
+ if(heapinfo1[i].busy_frag.frag_size[j] > 0){
+ if(heapinfo1[i].busy_frag.equal_to[j] == NULL){
+ if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
+ addr_frag1 = (void*) ((char *)addr_block1 + (j << heapinfo1[i].type));
+ real_addr_frag1 = (void*) ((char *)real_addr_block1 + (j << ((struct mdesc *)s_heap)->heapinfo[i].type));
+ XBT_DEBUG("Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag1, real_addr_frag1, heapinfo1[i].busy_frag.frag_size[j]);
+ //mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j);
+ }
+ nb_diff1++;
+ }
+ }
+ }
+ }
+ }
+ i++;
}
- memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
- e.used = mdp->heapinfo[block].busy_block.bt_size;
-
- xbt_ex_setup_backtrace(&e);
- if (e.used == 0) {
- fprintf(stderr, "(backtrace not set)\n");
- } else if (e.bt_strings == NULL) {
- fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
- } else {
- int i;
-
- fprintf(stderr, "Backtrace of where the block %zu was malloced (%d frames):\n", block ,e.used);
- for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
- fprintf(stderr,"%d",i);fflush(NULL);
- fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+ if(current_block == 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(heapinfo2[i].busy_block.busy_size > 0){
+ 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++;
+ }
+ }
+ }
}
+ if(heapinfo2[i].type > 0){
+ addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
+ real_addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)s_heap)->heapbase));
+ for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){
+ if(current_block == heaplimit){
+ if(heapinfo2[i].busy_frag.frag_size[j] > 0){
+ if(heapinfo2[i].busy_frag.equal_to[j] == NULL){
+ if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
+ addr_frag2 = (void*) ((char *)addr_block2 + (j << heapinfo2[i].type));
+ real_addr_frag2 = (void*) ((char *)real_addr_block2 + (j << ((struct mdesc *)s_heap)->heapinfo[i].type));
+ XBT_DEBUG( "Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag2, real_addr_frag2, heapinfo2[i].busy_frag.frag_size[j]);
+ //mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j);
+ }
+ nb_diff2++;
+ }
+ }
+ }
+ }
+ }
+ i++;
}
-}
-void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
+ if(current_block == heaplimit)
+ XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2);
- xbt_ex_t e;
+ xbt_dynar_free(&previous);
+ real_addr_frag1 = NULL, real_addr_block1 = NULL, real_addr_block2 = NULL, real_addr_frag2 = NULL;
+
+ return ((nb_diff1 > 0) || (nb_diff2 > 0));
+}
- memcpy(&e.bt,&(mdp->heapinfo[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
- e.used = XBT_BACKTRACE_SIZE;
+void reset_heap_information(){
- xbt_ex_setup_backtrace(&e);
- if (e.used == 0) {
- fprintf(stderr, "(backtrace not set)\n");
- } else if (e.bt_strings == NULL) {
- fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
- } else {
- int i;
+ size_t i = 0, j;
- fprintf(stderr, "Backtrace of where the fragment %zu in block %zu was malloced (%d frames):\n", frag, block ,e.used);
- for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
- fprintf(stderr,"%d",i);fflush(NULL);
- fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+ while(i<=heaplimit){
+ if(heapinfo1[i].type == 0){
+ xbt_free(heapinfo1[i].busy_block.equal_to);
+ heapinfo1[i].busy_block.equal_to = NULL;
}
+ if(heapinfo1[i].type > 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;
+ }
+ }
+ i++;
}
-}
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
+ i = 0;
- if(mdp1 == NULL && mdp2 == NULL){
- fprintf(stderr, "Malloc descriptors null\n");
- return 0;
+ while(i<=heaplimit){
+ if(heapinfo2[i].type == 0){
+ xbt_free(heapinfo2[i].busy_block.equal_to);
+ heapinfo2[i].busy_block.equal_to = NULL;
+ }
+ if(heapinfo2[i].type > 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++;
}
- int errors = mmalloc_compare_mdesc(mdp1, mdp2);
+ s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL;
+ heapinfo1 = NULL, heapinfo2 = NULL;
+ heaplimit = 0, heapsize1 = 0, heapsize2 = 0;
+ to_ignore1 = NULL, to_ignore2 = NULL;
- return (errors > 0);
+}
+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;
}
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
- int errors = 0;
+static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){
- if(mdp1->heaplimit != mdp2->heaplimit){
- fprintf(stderr,"Different limit of valid info table indices\n");
- return 1;
- }
+ unsigned int cursor = 0;
+ int start = 0;
+ int end = xbt_dynar_length(ignore_list) - 1;
+ mc_heap_ignore_region_t region;
- void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
+ while(start <= end){
+ cursor = (start + end) / 2;
+ region = (mc_heap_ignore_region_t)xbt_dynar_get_as(ignore_list, cursor, mc_heap_ignore_region_t);
+ if(region->address == address)
+ return region->size;
+ if(region->address < address)
+ start = cursor + 1;
+ if(region->address > address)
+ end = cursor - 1;
+ }
- void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
- void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
+ return 0;
+}
- void * breakval1 = (char *)mdp1 + ((char *)mdp1->breakval - (char *)s_heap);
- void * breakval2 = (char *)mdp2 + ((char *)mdp2->breakval - (char *)s_heap);
- size_t i, j;
- void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
- size_t frag_size;
+int compare_area(void *area1, void* area2, xbt_dynar_t previous){ /* Return code : 0 = equal, 1 = same size but different bytes, 2 = different size used */
- i = 1;
+ size_t i = 0, pointer_align = 0, ignore1 = 0, ignore2 = 0;
+ void *addr_pointed1, *addr_pointed2;
+ int res_compare;
+ ssize_t block1, frag1, block2, frag2;
+ ssize_t size;
+ int check_ignore = 0;
+ int j;
- int k;
- int distance = 0;
- int total_distance = 0;
+ void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
+ void *area1_to_compare, *area2_to_compare;
- int pointer_align;
- void *address_pointed1, *address_pointed2;
+ int match_pairs = 0;
- int block_pointed1, block_pointed2;
- void *addr_block_pointed1, *addr_block_pointed2;
+ if(previous == NULL){
+ previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
+ match_pairs = 1;
+ }
- /* Check busy blocks*/
+ block1 = ((char*)area1 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1;
+ block2 = ((char*)area2 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1;
- while(i < mdp1->heaplimit){
+ if(is_block_stack((int)block1) && is_block_stack((int)block2)){
+ add_heap_area_pair(previous, block1, -1, block2, -1);
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
- if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){
- fprintf(stderr,"Different type of block : %d - %d\n", mdp1->heapinfo[i].type, mdp2->heapinfo[i].type);
- errors++;
+ if(((char *)area1 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block1 > heapsize1) || (block1 < 1) || ((char *)area2 < (char*)((xbt_mheap_t)s_heap)->heapbase) || (block2 > heapsize2) || (block2 < 1)){
+ if(match_pairs){
+ xbt_dynar_free(&previous);
}
+ return 1;
+ }
- addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
- xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
-
- addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
- xbt_assert(addr_block2 < breakval2, "Block address out of heap memory used");
-
- if(mdp1->heapinfo[i].type == 0){ /* busy large block */
-
- if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_block.size){
- fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.size, mdp2->heapinfo[i].busy_block.size);
- fflush(NULL);
- errors++;
- }
-
- if(mdp1->heapinfo[i].busy_block.busy_size != mdp2->heapinfo[i].busy_block.busy_size){
- fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size);
- fflush(NULL);
- errors++;
- }
-
- /* Hamming distance on different blocks */
- distance = 0;
-
- //for(k=0;k<mdp1->heapinfo[i].busy_block.size * BLOCKSIZE;k++){
- for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
- if((((char *)addr_block1) + k != 0) && (((char *)addr_block2) + k != 0)){
- if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
- fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); fflush(NULL);
- pointer_align = (k / sizeof(void*)) * sizeof(void*);
- address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
- address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));
- if(((address_pointed1 > (void *)s_heap) && (address_pointed1 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
- block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
- block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
- //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
- if((block_pointed1 == 0) && (block_pointed2 == 0)){
- block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
- block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
- if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
- if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
- if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
- addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
- distance++;
- }else{
- fprintf(stderr, "False difference detected\n");
- }
- }else{
- distance++;
- }
- }else{ // Fragmented block
- addr_block_pointed1 = (char*)mdp1 + ((char *)address_pointed1 - (char *)s_heap);
- addr_block_pointed2 = (char*)mdp2 + ((char *)address_pointed2 - (char *)s_heap);
- if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[0]){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0]) != 0){
- fprintf(stderr, "Pointed fragments are different \n");
- distance++;
- }else{
- fprintf(stderr, "False difference detected\n");
- }
- }else{
- fprintf(stderr, "Different size of pointed fragments\n");
- distance ++;
- }
- }
- }else{
- fprintf(stderr, "Pointers on blocks with different types \n");
- distance++;
- }
- }else{
- /* FIXME : peut pointer vers le début d'un fragment mais dans un bloc */
- fprintf(stderr, "Pointed addresses (%p - %p) not valid\n", address_pointed1, address_pointed2);
- distance++;
- }
- }else{
- fprintf(stderr, "Pointed addresses (%p - %p) not in std_heap\n", address_pointed1, address_pointed2);
- distance++;
- }
+ 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){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }else if(heapinfo1[block1].type == 0){
+
+ 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;
+ }else{
+ if(match_pairs){
+ xbt_dynar_free(&previous);
}
+ return 1;
+ }
+ }
+
+ if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size){
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 1;
+ }
+
+ if(heapinfo1[block1].busy_block.busy_size != heapinfo2[block2].busy_block.busy_size){
+ if(match_pairs){
+ xbt_dynar_free(&previous);
}
- }
+ return 2;
+ }
+ if(!add_heap_area_pair(previous, block1, -1, block2, -1)){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
+
+ size = heapinfo1[block1].busy_block.busy_size;
+
+ if(size <= 0){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
- if(distance>0){
- fprintf(stderr,"\nDifferent data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, mdp1->heapinfo[i].busy_block.size, mdp1->heapinfo[i].busy_block.busy_size);
- fflush(NULL);
- fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
- mmalloc_backtrace_block_display(mdp1, i);
- mmalloc_backtrace_block_display(mdp2, i);
- fprintf(stderr, "\n");
- errors++;
- total_distance += distance;
- }
+ frag1 = -1;
+ frag2 = -1;
- i++;
+ area1_to_compare = addr_block1;
+ area2_to_compare = addr_block2;
+ if(heapinfo1[block1].busy_block.ignore == 1 && heapinfo2[block2].busy_block.ignore == 1)
+ check_ignore = 1;
+
}else{
+ 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;
+ }else{
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 1;
+ }
+ }
+
+ if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 2;
+ }
+
+ if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
+
+ size = heapinfo1[block1].busy_frag.frag_size[frag1];
+
+ if(size <= 0){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
+
+ if(heapinfo1[block1].busy_frag.ignore[frag1] == 1 && heapinfo2[block2].busy_frag.ignore[frag2] == 1)
+ check_ignore = 1;
+
+ }
+
+ }else if((heapinfo1[block1].type > 0) && (heapinfo2[block2].type > 0)){
- if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */
+ frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type;
+ frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type;
- if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){
- fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, mdp1->heapinfo[i].type, mdp2->heapinfo[i].type); fflush(NULL);
- errors++;
+ 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;
+ }else{
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 1;
+ }
+ }
- if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_frag.nfree){
- fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, mdp1->heapinfo[i].busy_frag.nfree, mdp2->heapinfo[i].busy_frag.nfree); fflush(NULL);
- errors++;
+ if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 2;
+ }
+
+ 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);
+ xbt_dynar_free(&previous);
+ }
+ return 0;
+ }
+
+ if(heapinfo1[block1].busy_frag.ignore[frag1] == 1 && heapinfo2[block2].busy_frag.ignore[frag2] == 1)
+ check_ignore = 1;
+
+ }else{
+ if(match_pairs){
+ xbt_dynar_free(&previous);
+ }
+ return 1;
+ }
+
+ while(i<size){
+
+ if(check_ignore){
+ if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)area1 + i)) > 0){
+ if((ignore2 = heap_comparison_ignore_size(to_ignore2, (char *)area2 + i)) == ignore1){
+ i = i + ignore2;
+ continue;
}
+ }
+ }
- if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_frag.first){
- fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size); fflush(NULL);
- errors++;
+ pointer_align = (i / sizeof(void*)) * sizeof(void*);
+ addr_pointed1 = *((void **)((char *)area1_to_compare + pointer_align));
+ addr_pointed2 = *((void **)((char *)area2_to_compare + pointer_align));
+
+ if(addr_pointed1 > maestro_stack_start && addr_pointed1 < maestro_stack_end && addr_pointed2 > maestro_stack_start && addr_pointed2 < maestro_stack_end){
+ i = pointer_align + sizeof(void *);
+ continue;
+ }else if((addr_pointed1 > s_heap) && ((char *)addr_pointed1 < (char *)s_heap + STD_HEAP_SIZE)
+ && (addr_pointed2 > s_heap) && ((char *)addr_pointed2 < (char *)s_heap + STD_HEAP_SIZE)){
+ res_compare = compare_area(addr_pointed1, addr_pointed2, previous);
+ if(res_compare != 0){
+ if(match_pairs)
+ xbt_dynar_free(&previous);
+ return res_compare;
+ }
+ }else{
+ j=0;
+ while(j<sizeof(void*) && (i + j) < size){
+ if(memcmp(((char *)area1_to_compare) + i + j, ((char *)area2_to_compare) + i + j , 1) != 0){
+ if(match_pairs)
+ xbt_dynar_free(&previous);
+ return 1;
}
+ j++;
+ }
+ }
+
+ i = pointer_align + sizeof(void *);
+ }
+
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
+
+ return 0;
+
+
+}
+
+static void heap_area_pair_free(heap_area_pair_t pair){
+ xbt_free(pair);
+ pair = NULL;
+}
+
+static void heap_area_pair_free_voidp(void *d)
+{
+ heap_area_pair_free((heap_area_pair_t) * (void **) d);
+}
+
+static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){
+
+ if(is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)){
+ heap_area_pair_t pair = NULL;
+ pair = xbt_new0(s_heap_area_pair_t, 1);
+ pair->block1 = block1;
+ pair->fragment1 = fragment1;
+ pair->block2 = block2;
+ pair->fragment2 = fragment2;
+
+ xbt_dynar_push(list, &pair);
+
+ return 1;
+ }
+
+ return 0;
+}
+
+static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){
+
+ unsigned int cursor = 0;
+ heap_area_pair_t current_pair;
+
+ xbt_dynar_foreach(list, cursor, current_pair){
+ if(current_pair->block1 == block1 && current_pair->block2 == block2 && current_pair->fragment1 == fragment1 && current_pair->fragment2 == fragment2)
+ return 0;
+ }
+
+ return 1;
+}
+
+
+void match_equals(xbt_dynar_t list){
+
+ unsigned int cursor = 0;
+ heap_area_pair_t current_pair;
+ heap_area_t previous_area;
+
+ 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(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);
+ }
+
+ 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{
+
+ 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(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);
+ }
+
+ 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);
+
+ }
+ }
+
+}
- frag_size = pow(2, mdp1->heapinfo[i].type);
+#ifndef max
+#define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#endif
- for(j=0; j< (BLOCKSIZE/frag_size); j++){
+int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
- if(mdp1->heapinfo[i].busy_frag.frag_size[j] != mdp2->heapinfo[i].busy_frag.frag_size[j]){
- fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %hu - %hu\n", j, i, mdp1->heapinfo[i].busy_frag.frag_size[j], mdp2->heapinfo[i].busy_frag.frag_size[j]); fflush(NULL);
- errors++;
+ 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++;
+ }
- if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){
-
- addr_frag1 = (char *)addr_block1 + (j * frag_size);
- xbt_assert(addr_frag1 < breakval1, "Fragment address out of heap memory used");
-
- addr_frag2 = (char *)addr_block2 + (j * frag_size);
- xbt_assert(addr_frag1 < breakval1, "Fragment address out of heap memory used");
-
- /* Hamming distance on different blocks */
- distance = 0;
- //for(k=0;k<frag_size;k++){
- for(k=0;k<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
- if((((char *)addr_frag1) + k != 0) && (((char *)addr_frag2) + k != 0)){
- if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
- fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); fflush(NULL);
- pointer_align = (k / sizeof(void*)) * sizeof(void*);
- address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align));
- address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align));
- if(((address_pointed1 > (void *)s_heap) && (address_pointed1 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
- block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
- block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
- if((block_pointed1 == 0) && (block_pointed2 == 0)){
- block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
- block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
- if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
- if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
- if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
- addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
- fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size);
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
- distance++;
- }else{
- fprintf(stderr, "False difference detected\n");
- }
- }else{
- distance++;
- }
- }else{ // Fragmented block
- addr_block_pointed1 = (char*)mdp1 + ((char *)address_pointed1 - (char *)s_heap);
- addr_block_pointed2 = (char*)mdp2 + ((char *)address_pointed2 - (char *)s_heap);
- if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[0]){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0]) != 0){
- distance++;
- }else{
- fprintf(stderr, "False difference detected\n");
- }
- }else{
- distance ++;
- }
- }
- }else{
- fprintf(stderr, "Pointers on blocks with different types \n");
- distance++;
- }
- }else{
- /* FIXME : peut pointer vers le début d'un fragment mais dans un bloc */
- fprintf(stderr, "Pointed addresses (%p - %p) not valid \n", address_pointed1, address_pointed2);
- distance++;
- }
- }else{
- fprintf(stderr, "Pointed addresses (%p - %p) not in std_heap\n", address_pointed1, address_pointed2);
- distance++;
- }
- }
- }
+ i++;
- }
+ }else { /* Fragmented block */
- if(distance > 0){
- fprintf(stderr,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, mdp1->heapinfo[i].busy_frag.frag_size[j], i);
- fprintf(stderr, "Hamming distance between fragments : %d\n", distance);
- mmalloc_backtrace_fragment_display(mdp1, i, j);
- mmalloc_backtrace_fragment_display(mdp2, i, j);
- fprintf(stderr, "\n");
- errors++;
- total_distance += distance;
+ 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++;
- }else{ /* free block */
+ }
+
+ }
- i++;
+ }
- }
+ return distance;
+
+}
- }
+static int is_stack(void *address){
+ unsigned int cursor = 0;
+ stack_region_t stack;
+ xbt_dynar_foreach(stacks_areas, cursor, stack){
+ if(address == stack->address)
+ return 1;
}
+ return 0;
+}
+
+static int is_block_stack(int block){
+ unsigned int cursor = 0;
+ stack_region_t stack;
- fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
+ xbt_dynar_foreach(stacks_areas, cursor, stack){
+ if(block == stack->block)
+ return 1;
+ }
- return (errors);
+ return 0;
}
+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;
+ }
-/* void *get_end_addr_heap(void *heap){ */
+ 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);
-/* FILE *fp; /\* File pointer to process's proc maps file *\/ */
-/* char *line = NULL; /\* Temporal storage for each line that is readed *\/ */
-/* ssize_t read; /\* Number of bytes readed *\/ */
-/* size_t n = 0; /\* Amount of bytes to read by getline *\/ */
+ }
-/* fp = fopen("/proc/self/maps", "r"); */
+}
-/* if(fp == NULL) */
-/* perror("fopen failed"); */
+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){
-/* xbt_dynar_t lfields = NULL; */
-/* xbt_dynar_t start_end = NULL; */
-/* void *start_addr; */
-/* void *end_addr; */
+ int start = 0;
+ int end = xbt_dynar_length(equals) - 1;
-/* while ((read = getline(&line, &n, fp)) != -1) { */
-/* xbt_str_trim(line, NULL); */
-/* xbt_str_strip_spaces(line); */
-/* lfields = xbt_str_split(line,NULL); */
+ 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;
+ }
-/* start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-"); */
-/* start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16); */
-/* end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16); */
+ if(found == 1)
+ xbt_dynar_remove_at(equals, cursor, NULL);
+
+ }else{
-/* if(start_addr == heap){ */
-/* free(line); */
-/* fclose(fp); */
-/* xbt_dynar_reset(lfields); */
-/* xbt_free(lfields); */
-/* xbt_dynar_reset(start_end); */
-/* xbt_free(start_end); */
-/* return end_addr; */
-/* } */
+ 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);
-/* xbt_dynar_reset(lfields); */
-/* xbt_free(lfields); */
-/* xbt_dynar_reset(start_end); */
-/* xbt_free(start_end); */
-/* free(line); */
-/* fclose(fp); */
-/* return 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;
-void mmalloc_display_info_heap(xbt_mheap_t h){
+ /* 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;
+
+}
+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;
+ }
+ }
+ 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;
+ }
+ }
+ return 0;
+}
