X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d1c9172064ba746ed23e4e36146a3605491f5fa..2be0e4648c5b7055580df1c265b7c43ee6763a46:/src/xbt/mmalloc/mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 6c72b25ee4..9cde9920d0 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -8,6 +8,7 @@
 
 #include "mmprivate.h"
 #include "gras_config.h"
+#include <math.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt,
                                 "Logging specific to mm_legacy in mmalloc");
@@ -74,8 +75,7 @@ void *realloc(void *p, size_t s)
     else
       ret = mmalloc(mdp, s);
   } else {
-    if (p)
-      mfree(mdp, p);
+    mfree(mdp, p);
   }
   UNLOCK(mdp);
 
@@ -174,52 +174,43 @@ int mmalloc_compare_heap(void *h1, void *h2){
     XBT_DEBUG("Malloc descriptors null");
     return 0;
   }
- 
 
   /* Heapstats */
 
   struct mstats ms1 = mmstats(h1);
   struct mstats ms2 = mmstats(h2);
 
-  if(ms1.bytes_total !=  ms2.bytes_total){
-    XBT_DEBUG("Different total size of the heap");
-    return 1;
-  }
-
   if(ms1.chunks_used !=  ms2.chunks_used){
-    XBT_DEBUG("Different chunks allocated by the user");
+    XBT_DEBUG("Different chunks allocated by the user : %zu - %zu", ms1.chunks_used, ms2.chunks_used);
     return 1;
   }
 
   if(ms1.bytes_used !=  ms2.bytes_used){
-    XBT_DEBUG("Different byte total of user-allocated chunks");
+    XBT_DEBUG("Different byte total of user-allocated chunks : %zu - %zu", ms1.bytes_used, ms2.bytes_used);
     return 1;
   }
 
   if(ms1.bytes_free !=  ms2.bytes_free){
-    XBT_DEBUG("Different byte total of chunks in the free list");
+    XBT_DEBUG("Different byte total of chunks in the free list : %zu - %zu", ms1.bytes_free, ms2.bytes_free);
     return 1;
   }
 
   if(ms1.chunks_free !=  ms2.chunks_free){
-    XBT_DEBUG("Different chunks in the free list");
+    XBT_DEBUG("Different chunks in the free list : %zu - %zu", ms1.chunks_free, ms2.chunks_free);
     return 1;
   }
 
   struct mdesc *mdp1, *mdp2;
   mdp1 = MD_TO_MDP(h1);
   mdp2 = MD_TO_MDP(h2);
-  
-  if(mmalloc_compare_mdesc(mdp1, mdp2))
-    return 1;
-  
 
-  return 0;
+  return mmalloc_compare_mdesc(mdp1, mdp2);
+
 }
 
 int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
-   if(mdp1->headersize != mdp2->headersize){
+  if(mdp1->headersize != mdp2->headersize){
     XBT_DEBUG("Different size of the file header for the mapped files");
     return 1;
   }
@@ -244,19 +235,20 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
     return 1;
   }
 
-  //XBT_DEBUG("Heap size : %d", mdp1->heapsize);
+  //XBT_DEBUG("Heap size : %zu", mdp1->heapsize);
 
   if(mdp1->heapbase != mdp2->heapbase){
     XBT_DEBUG("Different first block of the heap");
     return 1;
   }
 
+
   if(mdp1->heapindex != mdp2->heapindex){
-    XBT_DEBUG("Different index for the heap table");
+    XBT_DEBUG("Different index for the heap table : %zu - %zu", mdp1->heapindex, mdp2->heapindex);
     return 1;
   }
 
-  //XBT_DEBUG("Heap index : %d", mdp1->heapindex);
+  //XBT_DEBUG("Heap index : %zu", mdp1->heapindex);
 
   if(mdp1->base != mdp2->base){
     XBT_DEBUG("Different base address of the memory region");
@@ -278,7 +270,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
     return 1;
   }
 
-  //XBT_DEBUG("Heap limit : %d", mdp1->heaplimit);
+  //XBT_DEBUG("Heap limit : %zu", mdp1->heaplimit);
 
 
   if(mdp1->fd != mdp2->fd){
@@ -297,165 +289,127 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   }
 
  
-  size_t block_free1, start1, block_free2 , start2, block_busy1, block_busy2 ;
-  size_t i;
+  size_t block_free1, block_free2 , next_block_free, first_block_free, block_free ;
+  size_t i, j;
   void *addr_block1, *addr_block2;
-  struct mdesc* mdp;
-
-  start1 = block_free1 = mdp1->heapindex; 
-  start2 = block_free2 = mdp2->heapindex;
-  block_busy1 = start1 + mdp1->heapinfo[start1].free.size;
-  block_busy2 = start2 + mdp2->heapinfo[start2].free.size;
-
-  XBT_DEBUG("Block busy : %Zu - %Zu", block_busy1, block_busy2);
-
+  size_t frag_size;
+ 
 
-  if(mdp1->heapinfo[start1].free.size != mdp2->heapinfo[start2].free.size){ // <=> check block_busy
-    
-    XBT_DEBUG("Different size (in blocks) of a free cluster");
-    return 1;
+  /* Search index of the first free block */
 
-  }else{
+  block_free1 = mdp1->heapindex; 
+  block_free2 = mdp2->heapindex;
 
-    if(mdp1->heapinfo[start1].free.next != mdp2->heapinfo[start1].free.next){
+  while(mdp1->heapinfo[block_free1].free.prev != 0){
+    block_free1 = mdp1->heapinfo[block_free1].free.prev;
+  }
 
-      XBT_DEBUG("Different index of next free cluster");
-      return 1;
+  while(mdp2->heapinfo[block_free2].free.prev != 0){
+    block_free2 = mdp1->heapinfo[block_free2].free.prev;
+  }
 
-    }else{
-   
-      i=block_busy1 ;
+  if(block_free1 !=  block_free2){
+    XBT_DEBUG("Different first free block");
+    return 1;
+  }
 
-      XBT_DEBUG("Next free : %Zu", mdp1->heapinfo[start1].free.next);
+  first_block_free = block_free1;
 
+  if(mdp1->heapinfo[first_block_free].free.size != mdp2->heapinfo[first_block_free].free.size){ 
+    XBT_DEBUG("Different size (in blocks) of the first free cluster");
+    return 1;
+  }
 
-      while(i<mdp1->heapinfo[start1].free.next){
+  /* Check busy blocks (circular checking)*/
 
-	XBT_DEBUG("i (block busy) : %Zu", i);
+  i = first_block_free + mdp1->heapinfo[first_block_free].free.size;
 
-	if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
-	  XBT_DEBUG("Different type of busy block");
-	  return 1;
-	}else{
-	  mdp = mdp1;
-	  addr_block1 = ADDRESS(i);
-	  mdp = mdp2;
-	  addr_block2 = ADDRESS(i); 
-	  switch(mdp1->heapinfo[i].busy.type){
-	  case 0 :
-	    if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
-	      XBT_DEBUG("Different size of a large cluster");
-	      return 1;
-	    }else{
-	      XBT_DEBUG("Blocks %Zu : %p - %p / Data size : %Zu (%Zu blocks)", i, addr_block1, addr_block2, (mdp->heapinfo[i].busy.info.size * BLOCKSIZE),mdp->heapinfo[i].busy.info.size );	
-	      if(memcmp(addr_block1, addr_block2, mdp1->heapinfo[i].busy.info.size * BLOCKSIZE) != 0){
-		XBT_DEBUG("Different data in block %Zu", i);
-		return 1;
-	      } 
-	    }
-	    i = i + mdp1->heapinfo[i].busy.info.size;
-	    break;
-	  default :	  
-	    if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
-	      XBT_DEBUG("Different free fragments in a fragmented block");
-	      return 1;
-	    }else{
-	      if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
-		XBT_DEBUG("Different first free fragments of the block");
-		return 1; 
-	      }else{
-		if(memcmp(addr_block1, addr_block2, BLOCKSIZE) != 0){
-		  XBT_DEBUG("Different data in block %Zu", i);
-		  return 1;
-		} 
-	      }
-	    }
-	    i++;
-	    break;
-	  }
-	} 
-      }
+  if(mdp1->heapinfo[first_block_free].free.next != mdp2->heapinfo[first_block_free].free.next){
+    XBT_DEBUG("Different next block free");
+    return 1;
+  }
+  
+  block_free = first_block_free;
+  next_block_free = mdp1->heapinfo[first_block_free].free.next;
 
+  //XBT_DEBUG("First block free : %zu (size=%zu), Next block free : %zu", first_block_free, mdp1->heapinfo[block_free1].free.size, next_block_free);
 
-      block_free1 = mdp1->heapinfo[start1].free.next;
-      block_free2 = mdp2->heapinfo[start2].free.next;
+  if(next_block_free == 0)
+    next_block_free = mdp1->heaplimit;
 
-      //XBT_DEBUG("Index of next free cluster : %d", block_free1);
 
-      while((block_free1 != start1) && (block_free2 != start2)){ 
+  while(i != first_block_free){
 
-	block_busy1 = block_free1 + mdp1->heapinfo[block_free1].free.size;
-	block_busy2 = block_free2 + mdp2->heapinfo[block_free2].free.size;
+    while(i<next_block_free){
 
-	if(block_busy1 != block_busy2){
-	  XBT_DEBUG("Different index of busy block");
-	  return 1;
-	}else{
+      if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+	XBT_DEBUG("Different type of busy block");
+	return 1;
+      }else{
 
-	  XBT_DEBUG("Index of next busy block : %Zu - %Zu", block_busy1, block_busy2);
-	  XBT_DEBUG("Index of next free cluster : %Zu", mdp1->heapinfo[block_free1].free.next);
+	addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
+	addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
 	
-	  i = block_busy1;
-
-	  while(i<mdp1->heapinfo[block_free1].free.next){
-
-	    XBT_DEBUG("i (block busy) : %Zu", i);
-
-	    if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
-	      XBT_DEBUG("Different type of busy block");
+	switch(mdp1->heapinfo[i].busy.type){
+	case 0 :
+	  if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+	    XBT_DEBUG("Different size of a large cluster");
+	    return 1;
+	  }else{
+	    if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
+	      XBT_DEBUG("Different data in block %zu", i);
 	      return 1;
+	    } 
+	  }
+	  i = i+mdp1->heapinfo[i].busy.info.size;
+	  break;
+	default :	  
+	  if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
+	    XBT_DEBUG("Different free fragments in the fragmented block %zu", i);
+	    return 1;
+	  }else{
+	    if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
+	      XBT_DEBUG("Different first free fragments in the block %zu", i);
+	      return 1; 
 	    }else{
-	      mdp = mdp1;
-	      addr_block1 = ADDRESS(i);
-	      mdp = mdp2;
-	      addr_block2 = ADDRESS(i); 
-	      switch(mdp1->heapinfo[i].busy.type){
-	      case 0 :
-		if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
-		  XBT_DEBUG("Different size of a large cluster");
-		  return 1;
-		}else{
-		  XBT_DEBUG("Blocks %Zu : %p - %p / Data size : %Zu", i, addr_block1, addr_block2, (mdp->heapinfo[i].busy.info.size * BLOCKSIZE));		
-		  //XBT_DEBUG("Size of large cluster %d", mdp->heapinfo[i].busy.info.size);
-		  if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
-		    XBT_DEBUG("Different data in block %Zu", i);
-		    return 1;
-		  } 
-		}
-		i = i+mdp1->heapinfo[i].busy.info.size;
-		break;
-	      default :	  
-		if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
-		  XBT_DEBUG("Different free fragments in a fragmented block");
+	      frag_size = pow(2,mdp1->heapinfo[i].busy.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){
+		  XBT_DEBUG("Different data in fragment %Zu of block %Zu", j + 1, i);
 		  return 1;
-		}else{
-		  if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
-		    XBT_DEBUG("Different first free fragments of the block");
-		    return 1; 
-		  }else{
-		    if(memcmp(addr_block1, addr_block2, BLOCKSIZE) != 0){
-		      XBT_DEBUG("Different data in fragmented block %Zu", i);
-		      return 1;
-		    } 
-		  }
-		}
-		i++;
-		break;
+		} 
 	      }
-	    } 
+	    }
 	  }
+	  i++;
+	  break;
 	}
 
-	block_free1 = mdp1->heapinfo[block_free1].free.next;
-	block_free2 = mdp2->heapinfo[block_free2].free.next;
-      
-      } 
-    
+      }
     }
-  
+
+    if(mdp1->heapinfo[block_free].free.next != mdp2->heapinfo[block_free].free.next){
+      XBT_DEBUG("Different next block free");
+      return 1;
+    }
+     
+    block_free = mdp1->heapinfo[block_free].free.next;
+    next_block_free = mdp1->heapinfo[block_free].free.next;
+    if(i != first_block_free){
+      if(block_free != 0){
+	if(mdp1->heapinfo[block_free].free.size != mdp2->heapinfo[block_free].free.size){
+	  XBT_DEBUG("Different size of block free");
+	  return 1;
+	}
+	i = block_free + mdp1->heapinfo[block_free].free.size;
+      }else{
+	i = 1;
       }
-  return 0;   
+    }
+      
+  }
   
+  return 0;   
   
   
 }