Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
model-checker : extend pointer detection in heap comparison algorithm
[simgrid.git] / src / xbt / mmalloc / mm_diff.c
index 6e54a5d..9640523 100644 (file)
@@ -7,6 +7,7 @@
 
 #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");
@@ -90,7 +91,7 @@ void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
 }
 
 void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
-  
+
   xbt_ex_t e;
 
   memcpy(&e.bt,&(mdp->heapinfo[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
@@ -129,83 +130,19 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
   int errors = 0;
 
-  /*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(mdp1->flags != mdp2->flags){
-    fprintf(stderr,"Different flags\n");  
-    return 1;
-  }
-
-  if(mdp1->heapsize != mdp2->heapsize){
-    fprintf(stderr,"Different number of info entries\n");
-    return 1;
-  }  
-
-  if(mdp1->heapbase != mdp2->heapbase){
-    fprintf(stderr,"Different first block of the heap\n");
-    return 1;
-  }
-
-  if(mdp1->heapindex != mdp2->heapindex){
-    fprintf(stderr,"Different index for the heap table : %zu - %zu\n", mdp1->heapindex, mdp2->heapindex);
-    return 1;
-  }
-
-  if(mdp1->base != mdp2->base){
-    fprintf(stderr,"Different base address of the memory region\n");
-    return 1;
-  }
-
-  if(mdp1->breakval != mdp2->breakval){
-    fprintf(stderr,"Different current location in the memory region\n");
-    return 1;
-  }
-
-  if(mdp1->top != mdp2->top){
-    fprintf(stderr,"Different end of the current location in the memory region\n");
-    return 1;
-  }
-
   if(mdp1->heaplimit != mdp2->heaplimit){
     fprintf(stderr,"Different limit of valid info table indices\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;
-  }
+  void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
 
-  if(mdp1->version != mdp2->version){
-    fprintf(stderr,"Different version of the mmalloc package\n");
-    return 1;
-    }*/
-
-  //void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
-  //void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_heap);
-
-  xbt_mheap_t s_heap = mmalloc_get_current_heap();
-    
   void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
   void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
 
   size_t i, j;
   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
-  size_t frag_size = 0;         /* FIXME: arbitrary initialization */
-  /* size_t frag_size_pointed; FIXME: unused */
+  size_t frag_size;
 
   i = 1;
 
@@ -213,16 +150,13 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   int distance = 0;
   int total_distance = 0;
 
-  void *end_heap = get_end_addr_heap(s_heap);
-
   int pointer_align;
   void *address_pointed1, *address_pointed2;
 
-  int block_pointed1, block_pointed2;
+  int block_pointed1, block_pointed2, frag_pointed1, frag_pointed2;
   void *addr_block_pointed1, *addr_block_pointed2;
-  int frag_pointed1, frag_pointed2;
-
 
+  int pointer1 = 0, pointer2 = 0;
 
   /* Check busy blocks*/
 
@@ -233,250 +167,396 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
       errors++;
     }
 
-    //fprintf(stderr, "i = %zu, type = %d", i, mdp1->heapinfo[i].type);
-
-    //addr_block1 = (void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1);
-    //addr_block2 = (void*) (((ADDR2UINT(1)) - 1) * BLOCKSIZE + (char*)heapbase2);
-
-    addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
-    addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
+    /* 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[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++;
-      } 
+        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++;
-      } 
+        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(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 < end_heap)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < end_heap))){
-           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 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-                 //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-                 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 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-               //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-               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{
-             distance++;
-           }
-         }else{
-           distance++;
-         }
-           
-       }
+
+        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 ! \n");
+            fflush(NULL);
+            distance++;
+            continue;
+            }*/
+
+          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{
+              addr_block_pointed2 = addr_block2;
+              block_pointed2 = i;
+            }
+          }else{
+            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{
+              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
+              
+              if(pointer1)
+                frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+              else
+                frag_pointed1 = -1;
+              if(pointer2)
+                frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+              else
+                frag_pointed2 = -1;
+                            
+              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]){
+                
+                if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                  distance++;
+                }else{
+                  fprintf(stderr, "False difference detected\n");
+                }
+                
+              }else{
+                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{
+              if(pointer1)
+                frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+              else
+                frag_pointed1 = -1;
+              if(pointer2)
+                frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+              else
+                frag_pointed2 = -1;
+              
+              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]){
+                
+                if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                  distance++;
+                }else{
+                  fprintf(stderr, "False difference detected\n");
+                }
+                
+              }else{
+                distance ++;
+              }
+            }
+          }
+        }
+     
       }
 
 
       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;
+        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;
       }
-    
-      
+
       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++;
-       } 
-
-       //fprintf(stderr,"\n");
-
-       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);
-           addr_frag2 = (char *)addr_block2 + (j * frag_size);
-
-
-           /* 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 < end_heap)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < end_heap))){
-                 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 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-                       //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-                       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 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
-                     //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
-                     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{
-                   distance++;
-                 }
-               }else{
-                 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++;
+        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);
+            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;
+                  }*/
+
+                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{
+                    pointer2 = 0;
+                    addr_block_pointed2 = addr_block2;
+                    block_pointed2 = i;
+                  }
+                }else{
+                  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{
+                    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
+
+                    if(pointer1)
+                      frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+                    else
+                      frag_pointed1 = j;
+                    if(pointer2)
+                      frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+                    else
+                      frag_pointed2 = j;
+
+                    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]){
+                      
+                      if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                        distance++;
+                      }else{
+                        fprintf(stderr, "False difference detected\n");
+                      }
+                      
+                    }else{
+                      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{
+
+                    if(pointer1)
+                      frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> mdp1->heapinfo[block_pointed1].type;
+                    else
+                      frag_pointed1 = j;
+                    if(pointer2)
+                      frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> mdp2->heapinfo[block_pointed2].type;
+                    else
+                      frag_pointed2 = j;
+
+                    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]){
+                      
+                      if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+                        distance++;
+                      }else{
+                        fprintf(stderr, "False difference detected\n");
+                      }
+                      
+                    }else{
+                      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);
+              fprintf(stderr, "\n");
+              errors++;
+              total_distance += distance;
+
+            }
+
+          }
+        }
+
+        i++;
 
       }else{ /* free block */
 
-       i++;
-
-       //fprintf(stderr,"\n");
+        i++;
 
       }
-      
+
     }
 
   }
 
-  //free(pointed_address1);
-  //free(pointed_address2);
 
   fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
 
@@ -484,56 +564,56 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 }
 
 
-void *get_end_addr_heap(void *heap){
+/* 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 */
+/*   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");
+/*   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_dynar_t lfields = NULL; */
+/*   xbt_dynar_t start_end  = NULL; */
+/*   void *start_addr; */
+/*   void *end_addr; */
 
-    xbt_str_trim(line, NULL);
-    xbt_str_strip_spaces(line);
-    lfields = xbt_str_split(line,NULL);
+/*   while ((read = getline(&line, &n, fp)) != -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);
+/*     xbt_str_trim(line, NULL); */
+/*     xbt_str_strip_spaces(line); */
+/*     lfields = xbt_str_split(line,NULL); */
 
-    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;
-    }
+/*     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;
+/*   } */
 
+/*   xbt_dynar_reset(lfields); */
+/*   xbt_free(lfields); */
+/*   xbt_dynar_reset(start_end); */
+/*   xbt_free(start_end); */
+/*   free(line); */
+/*   fclose(fp); */
+/*   return NULL; */
 
-}
+
+/* } */
 
 
 void mmalloc_display_info_heap(xbt_mheap_t h){