X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e4e9f83ad19e0bae9c7fa0c779ce17ed4b3df4f..eb284828d592ce39bd4b96f084d7cce1d074d4b1:/src/xbt/mmalloc/mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 0a5f6d5cc2..f520762bac 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -168,7 +168,7 @@ void mmalloc_postexit(void)
   mmalloc_pre_detach(__mmalloc_default_mdp);
 }
 
-int mmalloc_compare_heap(void *h1, void *h2){
+int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr){
 
   if(h1 == NULL && h2 == NULL){
     XBT_DEBUG("Malloc descriptors null");
@@ -222,13 +222,13 @@ int mmalloc_compare_heap(void *h1, void *h2){
   mdp1 = MD_TO_MDP(h1);
   mdp2 = MD_TO_MDP(h2);
 
-  int res = mmalloc_compare_mdesc(mdp1, mdp2);
+  int res = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
 
   return ((errors + res ) > 0);
 
 }
 
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){
 
   int errors = 0;
 
@@ -440,7 +440,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	
 	switch(mdp1->heapinfo[i].busy.type){
 	case 0 :
-	  if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+	  if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){
 	    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
 	      XBT_DEBUG("Different size of a large cluster");
 	      errors++;
@@ -448,16 +448,16 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	      return 1;
 	    }
 	  }else{
-	    if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
+	    if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.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 - addr_block2 = %p)", i, mdp1->heapinfo[i].busy.info.size, addr_block1, addr_block2);
+		XBT_DEBUG("Different data in block %zu (size = %zu) (addr_block1 = %p (current = %p) - addr_block2 = %p)", i, mdp1->heapinfo[i].busy.info.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.info.size;
+	  i = i+mdp1->heapinfo[i].busy.info.block.size;
 
 	  break;
 	default :	  
@@ -533,7 +533,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	
 	    switch(mdp1->heapinfo[i].busy.type){
 	    case 0 :
-	      if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+	      if(mdp1->heapinfo[i].busy.info.block.size != mdp2->heapinfo[i].busy.info.block.size){
 		if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
 		  XBT_DEBUG("Different size of a large cluster");
 		  errors++;
@@ -541,9 +541,9 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		  return 1;
 		}
 	      }else{
-		if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.size * BLOCKSIZE)) != 0){
+		if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy.info.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 - addr_block2 = %p)", i, addr_block1, addr_block2);
+		    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++;
 		  }else{
 		    return 1;
@@ -551,7 +551,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		} 
 	      }
 	    
-	      i = i+mdp1->heapinfo[i].busy.info.size;
+	      i = i+mdp1->heapinfo[i].busy.info.block.size;
 
 	      break;
 	    default :