X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d11fe858c6f9521aca252c720720a19efa4a8945..6479f2478ed2c405d6f97e6aa87799b569f13319:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 0f9cf3ded7..8e209cf1f7 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -14,518 +14,514 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
 
 extern char *xbt_binary_name;
 
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
-  size_t block = BLOCK(ptr);
-  int type;
-  xbt_ex_t e;
-
-  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();
-  }
-
-  type = mdp->heapinfo[block].type;
-
-  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;
-  }
+xbt_dynar_t mmalloc_ignore;
 
-  memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
-  e.used = mdp->heapinfo[block].busy_block.bt_size;
+typedef struct s_heap_area_pair{
+  int block1;
+  int fragment1;
+  int block2;
+  int fragment2;
+}s_heap_area_pair_t, *heap_area_pair_t;
 
-  xbt_ex_setup_backtrace(&e);
-  if (e.used == 0) {
-    fprintf(stderr, "(backtrace not set)\n");
-  } else if (e.bt_strings == NULL) {
-    fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
-  } else {
-    int i;
+static void 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);
 
-    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);
-    }
-  }
-}
+static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous);
+static void match_equals(xbt_dynar_t list);
 
+static size_t heap_comparison_ignore(void *address);
 
-void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
+void mmalloc_backtrace_block_display(void* heapinfo, int block){
 
-  int type;
   xbt_ex_t e;
 
-  type = mdp->heapinfo[block].type;
-
-  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");
+  if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) {
+    XBT_DEBUG("No backtrace available for that block, sorry.");
     return;
   }
 
-  memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
-  e.used = mdp->heapinfo[block].busy_block.bt_size;
+  memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
+  e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size;
 
   xbt_ex_setup_backtrace(&e);
   if (e.used == 0) {
-    fprintf(stderr, "(backtrace not set)\n");
+    XBT_DEBUG("(backtrace not set)");
   } 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");
+    XBT_DEBUG("(backtrace not ready to be computed. %s)",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);
+    XBT_DEBUG("Backtrace of where the block %d was malloced (%d frames):", block ,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
-      fprintf(stderr,"%d",i);fflush(NULL);
-      fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+      XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
     }
   }
+
 }
 
-void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
-  
+void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){
+
   xbt_ex_t e;
 
-  memcpy(&e.bt,&(mdp->heapinfo[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
+  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");
+    XBT_DEBUG("(backtrace not set)");
   } 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");
+    XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
   } else {
     int i;
 
-    fprintf(stderr, "Backtrace of where the fragment %zu in block %zu was malloced (%d frames):\n", frag, block ,e.used);
+    XBT_DEBUG("Backtrace of where the fragment %d in block %d was malloced (%d frames):", 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);
+      XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
     }
   }
-}
-
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
-
-  if(mdp1 == NULL && mdp2 == NULL){
-    fprintf(stderr, "Malloc descriptors null\n");
-    return 0;
-  }
-
-  int errors = mmalloc_compare_mdesc(mdp1, mdp2);
-
-  return (errors > 0);
 
 }
 
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+void *s_heap, *heapbase1, *heapbase2;
+malloc_info *heapinfo1, *heapinfo2;
+size_t heaplimit, heapsize1, heapsize2;
 
-  int errors = 0;
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
 
-  /*if(mdp1->headersize != mdp2->headersize){
-    fprintf(stderr, "Different size of the file header for the mapped files\n");
-    return 1;
-  }
-
-  if(mdp1->refcount != mdp2->refcount){
-    fprintf(stderr, "Different number of processes that attached the heap\n");
-    return 1;
-  }
-
-  if(strcmp(mdp1->magic, mdp2->magic) != 0){
-    fprintf(stderr,"Different magic number\n");
-    return 1;
+  if(heap1 == NULL && heap1 == NULL){
+    XBT_DEBUG("Malloc descriptors null");
+    return 0;
   }
 
-  if(mdp1->flags != mdp2->flags){
-    fprintf(stderr,"Different flags\n");  
+  if(heap1->heaplimit != heap2->heaplimit){
+    XBT_DEBUG("Different limit of valid info table indices");
     return 1;
   }
 
-  if(mdp1->heapsize != mdp2->heapsize){
-    fprintf(stderr,"Different number of info entries\n");
-    return 1;
-  }  
+  /* Heap information */
+  heaplimit = ((struct mdesc *)heap1)->heaplimit;
 
-  if(mdp1->heapbase != mdp2->heapbase){
-    fprintf(stderr,"Different first block of the heap\n");
-    return 1;
-  }
+  s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
 
-  if(mdp1->heapindex != mdp2->heapindex){
-    fprintf(stderr,"Different index for the heap table : %zu - %zu\n", mdp1->heapindex, mdp2->heapindex);
-    return 1;
-  }
+  heapbase1 = (char *)heap1 + BLOCKSIZE;
+  heapbase2 = (char *)heap2 + BLOCKSIZE;
 
-  if(mdp1->base != mdp2->base){
-    fprintf(stderr,"Different base address of the memory region\n");
-    return 1;
-  }
+  heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)heap1->heapinfo - (char *)s_heap)));
+  heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)heap2->heapinfo - (char *)s_heap)));
 
-  if(mdp1->breakval != mdp2->breakval){
-    fprintf(stderr,"Different current location in the memory region\n");
-    return 1;
-  }
+  heapsize1 = heap1->heapsize;
+  heapsize2 = heap2->heapsize;
 
-  if(mdp1->top != mdp2->top){
-    fprintf(stderr,"Different end of the current location in the memory region\n");
-    return 1;
-  }
-
-  if(mdp1->fd != mdp2->fd){
-    fprintf(stderr,"Different file descriptor for the file to which this malloc heap is mapped\n");
-    return 1;
-  }
+  /* Start comparison */
+  size_t i1, i2, j1, j2, k;
+  void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
+  size_t frag_size1, frag_size2;
 
-  if(mdp1->version != mdp2->version){
-    fprintf(stderr,"Different version of the mmalloc package\n");
-    return 1;
-    }*/
+  xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
 
+  int equal;
 
-  if(mdp1->heaplimit != mdp2->heaplimit){
-    fprintf(stderr,"Different limit of valid info table indices\n");
-    return 1;
-  }
+  /* Check busy blocks*/
 
-  void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
-    
-  void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
-  void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
+  i1 = 1;
 
-  void * breakval1 = (char *)mdp1 + ((char *)mdp1->breakval - (char *)s_heap);
-  void * breakval2 = (char *)mdp2 + ((char *)mdp2->breakval - (char *)s_heap);
+  while(i1 < heaplimit){
 
-  size_t i, j;
-  void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
-  size_t frag_size = 0;         /* FIXME: arbitrary initialization */
+    i2 = 1;
+    equal = 0;
 
-  i = 1;
-
-  int k;
-  int distance = 0;
-  int total_distance = 0;
+    if(heapinfo1[i1].type == -1){ /* Free block */
+      i1++;
+      continue;
+    }
 
-  int pointer_align;
-  void *address_pointed1, *address_pointed2;
+    addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+
+    if(heapinfo1[i1].type == 0){  /* Large block */
+
+      while(i2 <= heaplimit && !equal){
+
+        if(heapinfo2[i2].type != 0){
+          i2++;
+          continue;
+        }
+
+        if(heapinfo2[i2].busy_block.equal_to == 1){         
+          i2++;
+          continue;
+        }
+        
+        if(heapinfo1[i1].busy_block.size != heapinfo2[i2].busy_block.size){
+          i2++;
+          continue;
+        }
+        
+        if(heapinfo1[i1].busy_block.busy_size != heapinfo2[i2].busy_block.busy_size){
+          i2++;
+          continue;
+        }
+
+        addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+        
+        /* Comparison */
+        add_heap_area_pair(previous, i1, -1, i2, -1);
+        if(!compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous)){
+          for(k=0; k < heapinfo2[i2].busy_block.size; k++)
+            heapinfo2[i2+k].busy_block.equal_to = 1;
+          for(k=0; k < heapinfo1[i1].busy_block.size; k++)
+            heapinfo1[i1+k].busy_block.equal_to = 1;
+          equal = 1;
+          match_equals(previous);
+        }
+        xbt_dynar_reset(previous);
+
+        i2++;
 
-  int block_pointed1, block_pointed2;
-  void *addr_block_pointed1, *addr_block_pointed2;
-  int frag_pointed1, frag_pointed2;
+      }
 
-  /* Check busy blocks*/
+    }else{ /* Fragmented block */
+
+      frag_size1 = 1 << heapinfo1[i1].type;
+
+      for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){
+
+        if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */
+          continue;
+        
+        addr_frag1 = (void*) ((char *)addr_block1 + (j1 * frag_size1));
+        
+        i2 = 1;
+        equal = 0;
+        
+        while(i2 <= heaplimit && !equal){
+          
+          if(heapinfo2[i2].type <= 0){
+            i2++;
+            continue;
+          }
+          
+          frag_size2 = 1 << heapinfo2[i2].type;
+
+          for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){
+
+            if(heapinfo2[i2].busy_frag.equal_to[j2] == 1){                 
+              continue;              
+            }
+             
+            if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]){ /* Different size_used */    
+              continue;
+            }
+             
+            addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+            addr_frag2 = (void*) ((char *)addr_block2 + (j2 * frag_size2));
+             
+            /* Comparison */
+            add_heap_area_pair(previous, i1, j1, i2, j2);
+            if(!compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous)){
+              heapinfo2[i2].busy_frag.equal_to[j2] = 1;
+              heapinfo1[i1].busy_frag.equal_to[j1] = 1;
+              equal = 1;
+              match_equals(previous);
+              break;
+            }
+            xbt_dynar_reset(previous);
+
+          }
+
+          i2++;
+
+        }
 
-  while(i < mdp1->heaplimit){
+      }
 
-    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++;
     }
 
-    addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
-    xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
+    i1++;
 
-    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 */
+  /* All blocks/fragments are equal to another block/fragment ? */
+  size_t i = 1, j = 0;
+  int nb_diff1 = 0, nb_diff2 = 0;
+  size_t frag_size = 0;
+ 
+  while(i<heaplimit){
+    if(heapinfo1[i].type == 0){
+      if(heapinfo1[i].busy_block.busy_size > 0){
+        if(heapinfo1[i].busy_block.equal_to == -1){
+          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){
+      frag_size = 1 << heapinfo1[i].type;
+      for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){
+        if(heapinfo1[i].busy_frag.frag_size[j] > 0){
+          if(heapinfo1[i].busy_frag.equal_to[j] == -1){
+            if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
+              addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
+              addr_frag1 = (void*) ((char *)addr_block1 + (j * frag_size));
+              XBT_DEBUG("Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag1, heapinfo1[i].busy_frag.frag_size[j]);
+              mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j);
+            }
+            nb_diff1++;
+          }
+        }
+      }
+    }
+    
+    i++; 
+  }
 
-      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++;
-      } 
+  XBT_DEBUG("Different blocks or fragments in heap1 : %d\n", nb_diff1);
 
-      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++;
-      } 
+  i = 1;
 
-  
-      /* 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(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 + 1;
-	    block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-	    //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
-	    if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
-	      if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
-		while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
-		  block_pointed1--;
-		while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
-		  block_pointed2--;
-		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
-		address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
-		address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
-		addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
-		addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
-		frag_pointed1 = 0;
-		while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 +1 ) * frag_size))){
-		  frag_pointed1++;
-		}
-		frag_pointed2 = 0;
-		while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 +1) * frag_size))){
-		  frag_pointed2++;
-		}
-		if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
-		  fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
-		  if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
-		    distance++;
-		  }else{
-		    fprintf(stderr, "False difference detected\n");
-		  }
-		}else{
-		  distance ++;
-		}
-		  
-		  
-	      }
-	    }else{
-	      fprintf(stderr, "Pointers on blocks with different types \n");
-	      distance++;
-	    }
-	  }else{
-	    fprintf(stderr, "Pointed address not in std_heap");
-	    distance++;
-	  }
-	    
-	}
+  while(i<heaplimit){
+    if(heapinfo2[i].type == 0){
+      if(heapinfo2[i].busy_block.busy_size > 0){
+        if(heapinfo2[i].busy_block.equal_to == -1){
+          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){
+      frag_size = 1 << heapinfo2[i].type;
+      for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){
+        if(heapinfo2[i].busy_frag.frag_size[j] > 0){
+          if(heapinfo2[i].busy_frag.equal_to[j] == -1){
+            if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
+              addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
+              addr_frag2 = (void*) ((char *)addr_block2 + (j * frag_size));
+              XBT_DEBUG( "Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag2, heapinfo2[i].busy_frag.frag_size[j]);
+              mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j);
+            }
+            nb_diff2++;
+          }
+        }
+      }
+    }
+    i++; 
+  }
 
+  XBT_DEBUG("Different blocks or fragments in heap2 : %d\n", nb_diff2);
+  
+  
+  /* Reset equal information */
+  i = 1;
 
-      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);
-	errors++; 
-	total_distance += distance;
+  while(i<heaplimit){
+    if(heapinfo1[i].type == 0){
+      heapinfo1[i].busy_block.equal_to = -1;
+    }
+    if(heapinfo1[i].type > 0){
+      for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){
+        heapinfo1[i].busy_frag.equal_to[j] = -1;
       }
-    
-      
-      i++;
-      
-    }else{
-      
-      if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */
-
-	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(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(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++;
-	} 
-
-	frag_size = pow(2, mdp1->heapinfo[i].type);
-
-	for(j=0; j< (BLOCKSIZE/frag_size); j++){
-
-	  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(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(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 + 1;
-		  block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
-		  //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
-		  if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
-		    if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
-		      while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
-			block_pointed1--;
-		      while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
-			block_pointed2--;
-		      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
-		      address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
-		      address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
-		      addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
-		      addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
-		      frag_pointed1 = 0;
-		      while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 + 1) * frag_size))){
-			frag_pointed1++;
-		      }
-		      frag_pointed2 = 0;
-		      while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 + 1) * frag_size))){
-			frag_pointed2++;
-		      }
-		      if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
-			fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
-			if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
-			  distance++;
-			}else{
-			  fprintf(stderr, "False difference detected\n");
-			}
-		      }else{
-			distance ++;
-		      }
-		    }
-		  }else{
-		    fprintf(stderr, "Pointers on blocks with different types \n");
-		    distance++;
-		  }
-		}else{
-		  fprintf(stderr, "Pointed address not in std_heap");
-		  distance++;
-		}
-	      }
-
-	    }
-	    
-	    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);
-	      errors++;
-	      total_distance += distance;
-	      
-	    }
-
-	  }
-	}
-
-	i++;
-
-      }else{ /* free block */
-
-	i++;
+    }
+    i++; 
+  }
 
+  i = 1;
+
+  while(i<heaplimit){
+    if(heapinfo2[i].type == 0){
+      heapinfo2[i].busy_block.equal_to = -1;
+    }
+    if(heapinfo2[i].type > 0){
+      for(j=0; j < MAX_FRAGMENT_PER_BLOCK; j++){
+        heapinfo2[i].busy_frag.equal_to[j] = -1;
       }
-      
     }
-
+    i++; 
   }
 
+  xbt_dynar_free(&previous);
+ 
+  return ((nb_diff1 > 0) || (nb_diff2 > 0));
 
-  fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
-
-  return (errors);
 }
 
+static size_t heap_comparison_ignore(void *address){
+  unsigned int cursor = 0;
+  mc_ignore_region_t region;
+  xbt_dynar_foreach(mmalloc_ignore, cursor, region){
+    if(region->address == address)
+      return region->size;
+  }
+  return 0;
+}
 
-/* void *get_end_addr_heap(void *heap){ */
 
-/*   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 *\/ */
+static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous){
 
-/*   fp = fopen("/proc/self/maps", "r"); */
-  
-/*   if(fp == NULL) */
-/*     perror("fopen failed"); */
+  size_t i = 0, pointer_align = 0, ignore1 = 0, ignore2 = 0;
+  void *address_pointed1, *address_pointed2, *addr_block_pointed1, *addr_block_pointed2, *addr_frag_pointed1, *addr_frag_pointed2;
+  size_t block_pointed1, block_pointed2, frag_pointed1, frag_pointed2;
+  size_t frag_size;
+  int res_compare;
+  void *current_area1, *current_area2;
+ 
+  while(i<size){
 
+    current_area1 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area1) + i) - (char *)heapbase1);
+    if((ignore1 = heap_comparison_ignore(current_area1)) > 0){
+      current_area2 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area2) + i) - (char *)heapbase2);
+      if((ignore2 = heap_comparison_ignore(current_area2))  == ignore1){
+        i = i + ignore2;
+        continue;
+      }
+    }
+   
+    if(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){
+
+      /* Check pointer difference */
+      pointer_align = (i / sizeof(void*)) * sizeof(void*);
+      address_pointed1 = *((void **)((char *)area1 + pointer_align));
+      address_pointed2 = *((void **)((char *)area2 + pointer_align));
+
+      /* Get pointed blocks number */ 
+      block_pointed1 = ((char*)address_pointed1 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1;
+      block_pointed2 = ((char*)address_pointed2 - (char*)((xbt_mheap_t)s_heap)->heapbase) / BLOCKSIZE + 1;
+
+      /* Check if valid blocks number */
+      if((char *)address_pointed1 < (char*)((xbt_mheap_t)s_heap)->heapbase || block_pointed1 > heapsize1 || block_pointed1 < 1 || (char *)address_pointed2 < (char*)((xbt_mheap_t)s_heap)->heapbase || block_pointed2 > heapsize2 || block_pointed2 < 1)
+        return 1;
+
+      if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){ /* Same type of block (large or fragmented) */
+
+        addr_block_pointed1 = ((void*) (((ADDR2UINT(block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+        addr_block_pointed2 = ((void*) (((ADDR2UINT(block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+        
+        if(heapinfo1[block_pointed1].type == 0){ /* Large block */
+
+          if(heapinfo1[block_pointed1].busy_block.size != heapinfo2[block_pointed2].busy_block.size){
+            return 1;
+          }
+
+          if(heapinfo1[block_pointed1].busy_block.busy_size != heapinfo2[block_pointed2].busy_block.busy_size){
+            return 1;
+          }
+
+          if(add_heap_area_pair(previous, block_pointed1, -1, block_pointed2, -1)){
+            
+            res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous);
+            
+            if(res_compare)    
+              return 1;
+           
+          }
+          
+        }else{ /* Fragmented block */
+
+           /* Get pointed fragments number */ 
+          frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> heapinfo1[block_pointed1].type;
+          frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> heapinfo2[block_pointed2].type;
+         
+          if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */    
+            return 1;
+
+          frag_size = 1 << heapinfo1[block_pointed1].type;
+            
+          addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 * frag_size));
+          addr_frag_pointed2 = (void*) ((char *)addr_block_pointed2 + (frag_pointed2 * frag_size));
+
+          if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){
+
+            res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous);
+            
+            if(res_compare)
+              return 1;
+           
+          }
+          
+        }
+          
+      }
 
-/*   xbt_dynar_t lfields = NULL; */
-/*   xbt_dynar_t start_end  = NULL; */
-/*   void *start_addr; */
-/*   void *end_addr; */
+      i = pointer_align + sizeof(void *);
+      
+    }else{
 
-/*   while ((read = getline(&line, &n, fp)) != -1) { */
+      i++;
 
-/*     xbt_str_trim(line, NULL); */
-/*     xbt_str_strip_spaces(line); */
-/*     lfields = xbt_str_split(line,NULL); */
+    }
+  }
 
-/*     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); */
+  return 0;
+  
 
-/*     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; */
-/*     } */
+}
 
-/*   } */
+static void heap_area_pair_free(heap_area_pair_t pair){
+  if (pair){
+    free(pair);
+    pair = NULL;
+  }
+}
 
-/*   xbt_dynar_reset(lfields); */
-/*   xbt_free(lfields); */
-/*   xbt_dynar_reset(start_end); */
-/*   xbt_free(start_end); */
-/*   free(line); */
-/*   fclose(fp); */
-/*   return 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;
+  }
 
-void mmalloc_display_info_heap(xbt_mheap_t h){
+  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;
 }
 
+static void match_equals(xbt_dynar_t list){
+
+  unsigned int cursor = 0;
+  heap_area_pair_t current_pair;
 
+  xbt_dynar_foreach(list, cursor, current_pair){
+    if(current_pair->fragment1 != -1){
+      heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = 1;
+      heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = 1;
+    }else{
+      heapinfo1[current_pair->block1].busy_block.equal_to = 1;
+      heapinfo2[current_pair->block2].busy_block.equal_to = 1;
+    }
+  }
+
+}