X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595cb02e823cffb0e2b21225bf44a108b2c667c5..4ff5af63978e7be02245b942faa818520488ed71:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 4c19a3861a..8aca355fc2 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -180,11 +180,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
     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;
@@ -195,18 +190,23 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
     return 1;
     }*/
 
-  //void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
-  //void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_heap);
+
+  if(mdp1->heaplimit != mdp2->heaplimit){
+    fprintf(stderr,"Different limit of valid info table indices\n");
+    return 1;
+  }
 
   void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
     
   void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
   void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
 
+  void * breakval1 = (char *)mdp1 + ((char *)mdp1->breakval - (char *)s_heap);
+  void * breakval2 = (char *)mdp2 + ((char *)mdp2->breakval - (char *)s_heap);
+
   size_t i, j;
   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
   size_t frag_size = 0;         /* FIXME: arbitrary initialization */
-  /* size_t frag_size_pointed; FIXME: unused */
 
   i = 1;
 
@@ -214,10 +214,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   int distance = 0;
   int total_distance = 0;
 
-  //void *end_heap = (char *)mdp1 + ((char*)mdp1->top - (char *)s_heap);
-  void *breakval1 = (char *)mdp1 + ((char*)mdp1->breakval - (char *)s_heap);
-  void *breakval2 = (char *)mdp2 + ((char*)mdp2->breakval - (char *)s_heap);
-
   int pointer_align;
   void *address_pointed1, *address_pointed2;
 
@@ -234,13 +230,11 @@ 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);
+    xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
+
     addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
+    xbt_assert(addr_block2 < breakval2, "Block address out of heap memory used");
 
     if(mdp1->heapinfo[i].type == 0){ /* busy large block */
 
@@ -278,8 +272,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		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);
 		  
@@ -295,8 +287,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	      }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;
@@ -363,8 +353,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	  errors++;
 	} 
 
-	//fprintf(stderr,"\n");
-
 	frag_size = pow(2, mdp1->heapinfo[i].type);
 
 	for(j=0; j< (BLOCKSIZE/frag_size); j++){
@@ -377,8 +365,10 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	  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);
+	    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;
@@ -400,8 +390,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		      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); 
@@ -416,8 +404,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		    }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;
@@ -468,16 +454,12 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
 	i++;
 
-	//fprintf(stderr,"\n");
-
       }
       
     }
 
   }
 
-  //free(pointed_address1);
-  //free(pointed_address2);
 
   fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);