X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18830ad59a14b63f78de5f8c6864ec894b00f18e..67d9420f78fbf068e11d3f575ebd59a995aeefee:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 5a081425dd..fe69f23ef7 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -6,32 +6,32 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex_interface.h" /* internals of backtrace setup */
+#include "xbt/str.h"
+#include "mc/mc.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
+                                "Logging specific to mm_diff in mmalloc");
 
 extern char *xbt_binary_name;
 
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
-  size_t block = BLOCK(ptr);
+void mmalloc_backtrace_block_display(xbt_mheap_t heap, size_t block){
+
   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;
+  type = heap->heapinfo[block].type;
 
   if (type != 0) {
-    //fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
+    fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
     return;
   }
-  if (mdp->heapinfo[block].busy_block.bt_size == 0) {
+  if (heap->heapinfo[block].busy_block.bt_size == 0) {
     fprintf(stderr,"No backtrace available for that block, sorry.\n");
     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,&(heap->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
+  e.used = heap->heapinfo[block].busy_block.bt_size;
 
   xbt_ex_setup_backtrace(&e);
   if (e.used == 0) {
@@ -41,7 +41,7 @@ void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
   } else {
     int i;
 
-    fprintf(stderr, "Backtrace of where the block %p where malloced (%d frames):\n",ptr,e.used);
+    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);
@@ -49,388 +49,519 @@ void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
   }
 }
 
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){
+void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
 
-  if(mdp1 == NULL && mdp2 == NULL){
-    XBT_DEBUG("Malloc descriptors null");
-    return 0;
-  }
-
-  /* Heapstats */
-
-  int errors = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
-
-  return (errors > 0);
-
-}
-
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){
-
-  int errors = 0;
-
-  if(mdp1->headersize != mdp2->headersize){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different size of the file header for the mapped files");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(mdp1->refcount != mdp2->refcount){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different number of processes that attached the heap");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  xbt_ex_t e;
 
-  if(strcmp(mdp1->magic, mdp2->magic) != 0){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different magic number");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  memcpy(&e.bt,&(mdp->heapinfo[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
+  e.used = XBT_BACKTRACE_SIZE;
 
-  if(mdp1->flags != mdp2->flags){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different flags");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  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;
 
-  if(mdp1->heapsize != mdp2->heapsize){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different number of info entries");
-      errors++;
-    }else{
-      return 1;
+    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);
     }
   }
+}
 
-  //XBT_DEBUG("Heap size : %zu", mdp1->heapsize);
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
 
-  if(mdp1->heapbase != mdp2->heapbase){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different first block of the heap");
-      errors++;
-    }else{
-      return 1;
-    }
+  if(mdp1 == NULL && mdp2 == NULL){
+    fprintf(stderr, "Malloc descriptors null\n");
+    return 0;
   }
 
+  int errors = mmalloc_compare_mdesc(mdp1, mdp2);
 
-  if(mdp1->heapindex != mdp2->heapindex){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different index for the heap table : %zu - %zu", mdp1->heapindex, mdp2->heapindex);
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  //XBT_DEBUG("Heap index : %zu", mdp1->heapindex);
+  return (errors > 0);
 
-  if(mdp1->base != mdp2->base){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different base address of the memory region");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+}
 
-  if(mdp1->breakval != mdp2->breakval){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different current location in the memory region");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
-  if(mdp1->top != mdp2->top){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different end of the current location in the memory region");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  int errors = 0;
 
   if(mdp1->heaplimit != mdp2->heaplimit){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different limit of valid info table indices");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(mdp1->fd != mdp2->fd){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different file descriptor for the file to which this malloc heap is mapped");
-      errors++;
-    }else{
-      return 1;
-    }
+    fprintf(stderr,"Different limit of valid info table indices\n");
+    return 1;
   }
 
-  if(mdp1->version != mdp2->version){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different version of the mmalloc package");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
 
+  void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
+  void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
 
-  size_t block_free1, block_free2 , next_block_free, first_block_free, block_free ;
   size_t i, j;
-  void *addr_block1, *addr_block2;
+  void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL;
   size_t frag_size;
 
+  i = 1;
 
-  /* Search index of the first free block */
-
-  block_free1 = mdp1->heapindex;
-  block_free2 = mdp2->heapindex;
+  int k = 0;
+  int distance = 0;
+  int total_distance = 0;
 
-  while(mdp1->heapinfo[block_free1].free_block.prev != 0){
-    block_free1 = mdp1->heapinfo[block_free1].free_block.prev;
-  }
+  int pointer_align;
+  void *address_pointed1 = NULL, *address_pointed2 = NULL;
 
-  while(mdp2->heapinfo[block_free2].free_block.prev != 0){
-    block_free2 = mdp1->heapinfo[block_free2].free_block.prev;
-  }
+  int block_pointed1, block_pointed2, frag_pointed1, frag_pointed2;
+  void *addr_block_pointed1 = NULL, *addr_block_pointed2 = NULL, *addr_frag_pointed1 = NULL, *addr_frag_pointed2 = NULL;
 
-  if(block_free1 !=  block_free2){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different first free block");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+  /* Check busy blocks*/
 
-  first_block_free = block_free1;
+  while(i < mdp1->heaplimit){
 
-  if(mdp1->heapinfo[first_block_free].free_block.size != mdp2->heapinfo[first_block_free].free_block.size){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different size (in blocks) of the first free cluster");
+    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++;
-    }else{
-      return 1;
     }
-  }
-
-  /* Check busy blocks (circular checking)*/
 
-  i = first_block_free + mdp1->heapinfo[first_block_free].free_block.size;
+    /* Get address of block i in each heap */
+    addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
+    addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
 
-  if(mdp1->heapinfo[first_block_free].free_block.next != mdp2->heapinfo[first_block_free].free_block.next){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different next block free");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
+    if(mdp1->heapinfo[i].type == 0){ /* busy large block */
 
-  block_free = first_block_free;
-  next_block_free = mdp1->heapinfo[first_block_free].free_block.next;
-
-  if(next_block_free == 0)
-    next_block_free = mdp1->heaplimit;
-
-  while(i != first_block_free){
-
-    while(i<next_block_free){
+      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].type != mdp2->heapinfo[i].type){
-        if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-          XBT_DEBUG("Different type of busy block");
-          errors++;
-        }else{
-          return 1;
-        }
-      }else{
+      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++;
+      }
 
-        addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
-        addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+      /* Hamming distance on different blocks */
+      distance = 0;
+
+
+      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);
+          
+          /* Check if pointer difference */
+          pointer_align = (k >> sizeof(void*)) * sizeof(void*);
+          address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
+          address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));
+
+          fprintf(stderr, "Addresses pointed : %p - %p\n", address_pointed1, address_pointed2);
+          
+          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((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) {
+            fprintf(stderr, "Unknown pointer(s) ! \n");
+            fflush(NULL);
+            distance++;
+            continue;
+          }
 
-        switch(mdp1->heapinfo[i].type){ //FIXME deal with type<0 == free
-        case 0 :
-          if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_block.size){
-            if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-              XBT_DEBUG("Different size of a large cluster");
-              errors++;
+          /*if(((char *) address_pointed1 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed1 < mdp1->heapsize) && (block_pointed1 >= 1)){
+            addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+            if(((char *) address_pointed2 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed2 < mdp2->heapsize) && (block_pointed2 >= 1)){
+              addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
             }else{
-              return 1;
+              addr_block_pointed2 = addr_block2;
+              block_pointed2 = i;
             }
           }else{
-            if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.size * BLOCKSIZE)) != 0){
-              if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                XBT_DEBUG("Different data in block %zu (size = %zu) (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, mdp1->heapinfo[i].busy_block.size, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2);
-                errors++;
-              }else{
-                return 1;
-              }
-            }
-          }
-          i = i+mdp1->heapinfo[i].busy_block.size;
-
-          break;
-        default :
-          if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_frag.nfree){
-            if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-              XBT_DEBUG("Different free fragments in the fragmented block %zu", i);
-              errors++;
+            addr_block_pointed1 = addr_block1;
+            block_pointed1 = i;
+            if(((char *) address_pointed2 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed2 < mdp2->heapsize) && (block_pointed2 >= 1)){
+              addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
             }else{
-              return 1;
+              fprintf(stderr, "Unknown pointers ! \n");
+              fflush(NULL);
+              distance++;
+              continue;
             }
-          }else{
-            if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_frag.first){
-              if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                XBT_DEBUG("Different first free fragments in the block %zu", i);
-                errors++;
+            }*/
+          
+          addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+          addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+          
+          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){
+                
+                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
+              
+
+              frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+              frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;             
+                            
+              fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+              
+              if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp2->heapinfo[block_pointed2].type)))){
+                fprintf(stderr, "Unknown pointer(s) ! \n");
+                fflush(NULL);
+                distance++;
+                continue;
+              } 
+
+              fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.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]){
+
+                addr_frag_pointed1 = (char *)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, mdp1->heapinfo[block_pointed1].type));
+                addr_frag_pointed2 = (char *)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, mdp2->heapinfo[block_pointed2].type));
+                
+                if(memcmp(addr_frag_pointed1, addr_frag_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                  distance++;
+                }else{
+                  fprintf(stderr, "False difference detected\n");
+                }
+                
               }else{
-                return 1;
+                distance ++;
               }
+            }
+            
+          }else{
+
+            if(((mdp1->heapinfo[block_pointed1].type == 0) && (mdp2->heapinfo[block_pointed2].type != 0)) || ((mdp1->heapinfo[block_pointed1].type != 0) && (mdp2->heapinfo[block_pointed2].type == 0))){  
+              fprintf(stderr, "Pointers on blocks with different types \n");
+              distance++;
             }else{
-              frag_size = pow(2,mdp1->heapinfo[i].type);
-              for(j=0 ; j< (BLOCKSIZE/frag_size); j++){
-                if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){
-                  if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                    XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size),  i);
-                    errors++;
-                  }else{
-                    return 1;
-                  }
+             
+              frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+              frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+            
+              fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+              
+              if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp2->heapinfo[block_pointed2].type)))){
+                fprintf(stderr, "Unknown pointer(s) ! \n");
+                fflush(NULL);
+                distance++;
+                continue;
+              } 
+              
+              fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.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]){
+
+                addr_frag_pointed1 = (char *)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, mdp1->heapinfo[block_pointed1].type));
+                addr_frag_pointed2 = (char *)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, mdp2->heapinfo[block_pointed2].type));
+                                
+                if(memcmp(addr_frag_pointed1, addr_frag_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                  distance++;
+                }else{
+                  fprintf(stderr, "False difference detected\n");
                 }
+                
+              }else{
+                distance ++;
               }
             }
           }
-
-          i++;
-
-          break;
         }
+     
+      }
+
 
+      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;
       }
-    }
 
-    if( i != first_block_free){
+      i++;
+
+    }else{
+
+      if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */
 
-      if(mdp1->heapinfo[block_free].free_block.next != mdp2->heapinfo[block_free].free_block.next){
-        if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-          XBT_DEBUG("Different next block free");
+        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++;
-        }else{
-          return 1;
         }
-      }
 
-      block_free = mdp1->heapinfo[block_free].free_block.next;
-      next_block_free = mdp1->heapinfo[block_free].free_block.next;
+        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++;
+        }
 
-      i = block_free + mdp1->heapinfo[block_free].free_block.size;
+        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++;
+        }
 
-      if((next_block_free == 0) && (i != mdp1->heaplimit)){
+        frag_size = pow(2, mdp1->heapinfo[i].type);
 
-        while(i < mdp1->heaplimit){
+        for(j=0; j< (BLOCKSIZE/frag_size); j++){
 
-          if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){
-            if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-              XBT_DEBUG("Different type of busy block");
-              errors++;
-            }else{
-              return 1;
-            }
-          }else{
+          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++;
+          }
 
-            addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
-            addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE);
+          if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){
 
-            switch(mdp1->heapinfo[i].type){
-            case 0 :
-              if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_block.size){
-                if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                  XBT_DEBUG("Different size of a large cluster");
-                  errors++;
-                }else{
-                  return 1;
+            addr_frag1 = (char *)addr_block1 + (j * frag_size);
+            addr_frag2 = (char *)addr_block2 + (j * frag_size);
+
+            /* Hamming distance on different blocks */
+            distance = 0;
+
+            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));
+
+                fprintf(stderr, "Addresses pointed : %p - %p\n", address_pointed1, address_pointed2);
+
+                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((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) {
+                  fprintf(stderr, "Unknown pointer ! \n");
+                  fflush(NULL);
+                  distance++;
+                  continue;
                 }
-              }else{
-                if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.size * BLOCKSIZE)) != 0){
-                  if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                    XBT_DEBUG("Different data in block %zu (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2);
-                    errors++;
+
+                /*if(((char *) address_pointed1 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed1 < mdp1->heapsize) && (block_pointed1 >= 1)){
+                  addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+                  pointer1 = 1;
+                  if(((char *) address_pointed2 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed2 < mdp2->heapsize) && (block_pointed2 >= 1)){
+                    addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+                    pointer2 = 1;
                   }else{
-                    return 1;
+                    pointer2 = 0;
+                    addr_block_pointed2 = addr_block2;
+                    block_pointed2 = i;
                   }
-                }
-              }
-
-              i = i+mdp1->heapinfo[i].busy_block.size;
-
-              break;
-            default :
-              if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_frag.nfree){
-                if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                  XBT_DEBUG("Different free fragments in the fragmented block %zu", i);
-                  errors++;
                 }else{
-                  return 1;
-                }
-              }else{
-                if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_frag.first){
-                  if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                    XBT_DEBUG("Different first free fragments in the block %zu", i);
-                    errors++;
+                  addr_block_pointed1 = addr_block1;
+                  block_pointed1 = i;
+                  pointer1 = 0;
+                  if(((char *) address_pointed2 > (char*)((struct mdesc*)s_heap)->heapbase) && (block_pointed2 < mdp2->heapsize) && (block_pointed2 >= 1)){
+                    addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+                    pointer2 = 1;
                   }else{
-                    return 1;
+                    fprintf(stderr, "Unknown pointers ! \n");
+                    fflush(NULL);
+                    distance++;
+                    continue;
+                  }
+                  }*/
+
+                addr_block_pointed1 = ((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+                addr_block_pointed2 = ((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2));
+                
+                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){
+                      
+                      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
+
+                   
+                    frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+                    frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+                   
+                    fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+                    
+                    if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp2->heapinfo[block_pointed2].type)))){
+                       fprintf(stderr, "Unknown pointer ! \n");
+                       fflush(NULL);
+                       distance++;
+                       continue;
+                    } 
+
+                    fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.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]){
+
+                      addr_frag_pointed1 = (char *)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, mdp1->heapinfo[block_pointed1].type));
+                      addr_frag_pointed2 = (char *)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, mdp2->heapinfo[block_pointed2].type));
+                      
+                      if(memcmp(addr_frag_pointed1, addr_frag_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                        distance++;
+                      }else{
+                        fprintf(stderr, "False difference detected\n");
+                      }
+                      
+                    }else{
+                      distance ++;
+                    }
                   }
+
                 }else{
-                  frag_size = pow(2,mdp1->heapinfo[i].type);
-                  for(j=0 ; j< (BLOCKSIZE/frag_size); j++){
-                    if(memcmp((char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size), frag_size) != 0){
-                      if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-                        XBT_DEBUG("Different data in fragment %zu (addr_frag1 = %p - addr_frag2 = %p) of block %zu", j + 1, (char *)addr_block1 + (j * frag_size), (char *)addr_block2 + (j * frag_size),  i);
-                        errors++;
+
+                  if(((mdp1->heapinfo[block_pointed1].type == 0) && (mdp2->heapinfo[block_pointed2].type != 0)) || ((mdp1->heapinfo[block_pointed1].type != 0) && (mdp2->heapinfo[block_pointed2].type == 0))){  
+                    fprintf(stderr, "Pointers on blocks with different types \n");
+                    distance++;
+                  }else{
+
+                    frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+                    frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+                   
+                    fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+                    
+                    if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp2->heapinfo[block_pointed2].type)))){
+                       fprintf(stderr, "Unknown pointers ! \n");
+                       fflush(NULL);
+                       distance++;
+                       continue;
+                    } 
+
+                    fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.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]){
+
+                      addr_frag_pointed1 = (char *)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, mdp1->heapinfo[block_pointed1].type));
+                      addr_frag_pointed2 = (char *)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, mdp2->heapinfo[block_pointed2].type));
+                      
+                      if(memcmp(addr_frag_pointed1, addr_frag_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                        distance++;
                       }else{
-                        return 1;
+                        fprintf(stderr, "False difference detected\n");
                       }
+                      
+                    }else{
+                      distance ++;
                     }
                   }
+                  
                 }
               }
 
-              i++;
+            }
+
+            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;
 
-              break;
             }
+
           }
         }
 
+        i++;
+
+      }else{ /* free block */
+
+        i++;
+
       }
 
     }
+
   }
 
-  return (errors>0);
+
+  fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
+
+  return (errors);
 }
 
 
-void mmalloc_display_info_heap(xbt_mheap_t h){
+/* 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 *\/ */
+
+/*   fp = fopen("/proc/self/maps", "r"); */
+
+/*   if(fp == NULL) */
+/*     perror("fopen failed"); */
+
+
+/*   xbt_dynar_t lfields = NULL; */
+/*   xbt_dynar_t start_end  = NULL; */
+/*   void *start_addr; */
+/*   void *end_addr; */
+
+/*   while ((read = getline(&line, &n, fp)) != -1) { */
+
+/*     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); */
+
+/*     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_reset(lfields); */
+/*   xbt_free(lfields); */
+/*   xbt_dynar_reset(start_end); */
+/*   xbt_free(start_end); */
+/*   free(line); */
+/*   fclose(fp); */
+/*   return NULL; */
+
+
+/* } */