X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/350f5a1112fad1d38efb016e582d96d3eb4a4d79..04eb21634ce9041eaf00274eec16e20dbf5f70d0:/src/xbt/mmalloc/mm_legacy.c?ds=sidebyside

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index c75d10b9b6..b353835634 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -13,16 +13,21 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mm_legacy, xbt,
                                 "Logging specific to mm_legacy in mmalloc");
 
-static void *__mmalloc_current_heap = NULL;     /* The heap we are currently using. */
+/* The mmalloc() package can use a single implicit malloc descriptor
+   for mmalloc/mrealloc/mfree operations which do not supply an explicit
+   descriptor.  This allows mmalloc() to provide
+   backwards compatibility with the non-mmap'd version. */
+xbt_mheap_t __mmalloc_default_mdp = NULL;
 
-#include "xbt_modinter.h"
 
-void *mmalloc_get_current_heap(void)
+static xbt_mheap_t __mmalloc_current_heap = NULL;     /* The heap we are currently using. */
+
+xbt_mheap_t mmalloc_get_current_heap(void)
 {
   return __mmalloc_current_heap;
 }
 
-void mmalloc_set_current_heap(void *new_heap)
+void mmalloc_set_current_heap(xbt_mheap_t new_heap)
 {
   __mmalloc_current_heap = new_heap;
 }
@@ -30,11 +35,8 @@ void mmalloc_set_current_heap(void *new_heap)
 #ifdef MMALLOC_WANT_OVERIDE_LEGACY
 void *malloc(size_t n)
 {
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
-#endif
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
   LOCK(mdp);
   void *ret = mmalloc(mdp, n);
   UNLOCK(mdp);
@@ -44,39 +46,22 @@ void *malloc(size_t n)
 
 void *calloc(size_t nmemb, size_t size)
 {
-  size_t total_size = nmemb * size;
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
-#endif
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
   LOCK(mdp);
-  void *ret = mmalloc(mdp, total_size);
+  void *ret = mcalloc(mdp, nmemb,size);
   UNLOCK(mdp);
 
-  /* Fill the allocated memory with zeroes to mimic calloc behaviour */
-  memset(ret, '\0', total_size);
-
   return ret;
 }
 
 void *realloc(void *p, size_t s)
 {
   void *ret = NULL;
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
-#endif
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
   LOCK(mdp);
-  if (s) {
-    if (p)
-      ret = mrealloc(mdp, p, s);
-    else
-      ret = mmalloc(mdp, s);
-  } else {
-    mfree(mdp, p);
-  }
+  ret = mrealloc(mdp, p, s);
   UNLOCK(mdp);
 
   return ret;
@@ -84,147 +69,27 @@ void *realloc(void *p, size_t s)
 
 void free(void *p)
 {
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_GTNETS
-  if(!mdp) return;
-#endif
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
   LOCK(mdp);
   mfree(mdp, p);
   UNLOCK(mdp);
 }
 #endif
 
-/* Make sure it works with md==NULL */
-
-/* Safety gap from the heap's break address.
- * Try to increase this first if you experience strange errors under
- * valgrind. */
-#define HEAP_OFFSET   (128UL<<20)
-
-void *mmalloc_get_default_md(void)
-{
-  xbt_assert(__mmalloc_default_mdp);
-  return __mmalloc_default_mdp;
-}
-
-static void mmalloc_fork_prepare(void)
-{
-  struct mdesc* mdp = NULL;
-  if ((mdp =__mmalloc_default_mdp)){
-    while(mdp){
-      LOCK(mdp);
-      if(mdp->fd >= 0){
-        mdp->refcount++;
-      }
-      mdp = mdp->next_mdesc;
-    }
-  }
-}
-
-static void mmalloc_fork_parent(void)
-{
-  struct mdesc* mdp = NULL;
-  if ((mdp =__mmalloc_default_mdp)){
-    while(mdp){
-      if(mdp->fd < 0)
-        UNLOCK(mdp);
-      mdp = mdp->next_mdesc;
-    }
-  }
-}
-
-static void mmalloc_fork_child(void)
-{
-  struct mdesc* mdp = NULL;
-  if ((mdp =__mmalloc_default_mdp)){
-    while(mdp){
-      UNLOCK(mdp);
-      mdp = mdp->next_mdesc;
-    }
-  }
-}
-
-/* Initialize the default malloc descriptor. */
-void mmalloc_preinit(void)
-{
-  int res;
-  if (!__mmalloc_default_mdp) {
-    unsigned long mask = ~((unsigned long)getpagesize() - 1);
-    void *addr = (void*)(((unsigned long)sbrk(0) + HEAP_OFFSET) & mask);
-    __mmalloc_default_mdp = mmalloc_attach(-1, addr);
-    /* Fixme? only the default mdp in protected against forks */
-    res = xbt_os_thread_atfork(mmalloc_fork_prepare,
-			       mmalloc_fork_parent, mmalloc_fork_child);
-    if (res != 0)
-      THROWF(system_error,0,"xbt_os_thread_atfork() failed: return value %d",res);
-  }
-  xbt_assert(__mmalloc_default_mdp != NULL);
-}
-
-void mmalloc_postexit(void)
-{
-  /* Do not detach the default mdp or ldl won't be able to free the memory it allocated since we're in memory */
-  //  mmalloc_detach(__mmalloc_default_mdp);
-  mmalloc_pre_detach(__mmalloc_default_mdp);
-}
 
-int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr){
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){
 
-  if(h1 == NULL && h2 == NULL){
+  if(mdp1 == NULL && mdp2 == NULL){
     XBT_DEBUG("Malloc descriptors null");
     return 0;
   }
 
   /* Heapstats */
 
-  int errors = 0;
+  int errors = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
 
-  struct mstats ms1 = mmstats(h1);
-  struct mstats ms2 = mmstats(h2);
-
-  if(ms1.chunks_used !=  ms2.chunks_used){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different chunks allocated by the user : %zu - %zu", ms1.chunks_used, ms2.chunks_used);
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(ms1.bytes_used !=  ms2.bytes_used){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different byte total of user-allocated chunks : %zu - %zu", ms1.bytes_used, ms2.bytes_used);
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(ms1.bytes_free !=  ms2.bytes_free){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different byte total of chunks in the free list : %zu - %zu", ms1.bytes_free, ms2.bytes_free);
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(ms1.chunks_free !=  ms2.chunks_free){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different chunks in the free list : %zu - %zu", ms1.chunks_free, ms2.chunks_free);
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  struct mdesc *mdp1, *mdp2;
-  mdp1 = MD_TO_MDP(h1);
-  mdp2 = MD_TO_MDP(h2);
-
-  int res = mmalloc_compare_mdesc(mdp1, mdp2, std_heap_addr);
-
-  return ((errors + res ) > 0);
+  return (errors > 0);
 
 }
 
@@ -345,16 +210,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
     }
   }
 
-  if(mdp1->saved_errno != mdp2->saved_errno){
-    if(XBT_LOG_ISENABLED(xbt_mm_legacy, xbt_log_priority_debug)){
-      XBT_DEBUG("Different errno");
-      errors++;
-    }else{
-      return 1;
-    }
-  }
-
-  if(mdp1->version != mdp2->version){
+   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++;
@@ -375,12 +231,12 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
   block_free1 = mdp1->heapindex; 
   block_free2 = mdp2->heapindex;
 
-  while(mdp1->heapinfo[block_free1].free.prev != 0){
-    block_free1 = mdp1->heapinfo[block_free1].free.prev;
+  while(mdp1->heapinfo[block_free1].free_block.prev != 0){
+    block_free1 = mdp1->heapinfo[block_free1].free_block.prev;
   }
 
-  while(mdp2->heapinfo[block_free2].free.prev != 0){
-    block_free2 = mdp1->heapinfo[block_free2].free.prev;
+  while(mdp2->heapinfo[block_free2].free_block.prev != 0){
+    block_free2 = mdp1->heapinfo[block_free2].free_block.prev;
   }
 
   if(block_free1 !=  block_free2){
@@ -394,7 +250,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 
   first_block_free = block_free1;
 
-  if(mdp1->heapinfo[first_block_free].free.size != mdp2->heapinfo[first_block_free].free.size){ 
+  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");
       errors++;
@@ -405,9 +261,9 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 
   /* Check busy blocks (circular checking)*/
 
-  i = first_block_free + mdp1->heapinfo[first_block_free].free.size;
+  i = first_block_free + mdp1->heapinfo[first_block_free].free_block.size;
 
-  if(mdp1->heapinfo[first_block_free].free.next != mdp2->heapinfo[first_block_free].free.next){
+  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++;
@@ -417,7 +273,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
   }
   
   block_free = first_block_free;
-  next_block_free = mdp1->heapinfo[first_block_free].free.next;
+  next_block_free = mdp1->heapinfo[first_block_free].free_block.next;
 
   if(next_block_free == 0)
     next_block_free = mdp1->heaplimit;
@@ -426,7 +282,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 
     while(i<next_block_free){
 
-      if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+      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++;
@@ -438,9 +294,9 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 	addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
 	addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
 	
-	switch(mdp1->heapinfo[i].busy.type){
+	switch(mdp1->heapinfo[i].type){ //FIXME deal with type<0 == free
 	case 0 :
-	  if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+	  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++;
@@ -448,20 +304,20 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 	      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_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.info.size, addr_block1, (char *)std_heap_addr + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE), addr_block2);
+		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.info.size;
+	  i = i+mdp1->heapinfo[i].busy_block.size;
 
 	  break;
 	default :	  
-	  if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
+	  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++;
@@ -469,7 +325,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 	      return 1;
 	    }
 	  }else{
-	    if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
+	    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++;
@@ -477,7 +333,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 		return 1;
 	      } 
 	    }else{
-	      frag_size = pow(2,mdp1->heapinfo[i].busy.type);
+	      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)){
@@ -501,7 +357,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 
     if( i != first_block_free){
 
-      if(mdp1->heapinfo[block_free].free.next != mdp2->heapinfo[block_free].free.next){
+      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");
 	  errors++;
@@ -510,16 +366,16 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 	}
       }
      
-      block_free = mdp1->heapinfo[block_free].free.next;
-      next_block_free = mdp1->heapinfo[block_free].free.next;
+      block_free = mdp1->heapinfo[block_free].free_block.next;
+      next_block_free = mdp1->heapinfo[block_free].free_block.next;
 
-      i = block_free + mdp1->heapinfo[block_free].free.size;
+      i = block_free + mdp1->heapinfo[block_free].free_block.size;
 
       if((next_block_free == 0) && (i != mdp1->heaplimit)){
 
 	while(i < mdp1->heaplimit){
 
-	  if(mdp1->heapinfo[i].busy.type != mdp2->heapinfo[i].busy.type){
+	  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++;
@@ -531,9 +387,9 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 	    addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
 	    addr_block2 = (char *)mdp2 + sizeof(struct mdesc) + ((i-1) * BLOCKSIZE); 
 	
-	    switch(mdp1->heapinfo[i].busy.type){
+	    switch(mdp1->heapinfo[i].type){
 	    case 0 :
-	      if(mdp1->heapinfo[i].busy.info.size != mdp2->heapinfo[i].busy.info.size){
+	      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++;
@@ -541,7 +397,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 		  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_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++;
@@ -551,11 +407,11 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 		} 
 	      }
 	    
-	      i = i+mdp1->heapinfo[i].busy.info.size;
+	      i = i+mdp1->heapinfo[i].busy_block.size;
 
 	      break;
 	    default :	  
-	      if(mdp1->heapinfo[i].busy.info.frag.nfree != mdp2->heapinfo[i].busy.info.frag.nfree){
+	      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++;
@@ -563,7 +419,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 		  return 1;
 		}
 	      }else{
-		if(mdp1->heapinfo[i].busy.info.frag.first != mdp2->heapinfo[i].busy.info.frag.first){
+		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++;
@@ -571,7 +427,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 		    return 1;
 		  } 
 		}else{
-		  frag_size = pow(2,mdp1->heapinfo[i].busy.type);
+		  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)){
@@ -601,8 +457,6 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap
 }
 
  
-void mmalloc_display_info_heap(void *h){
+void mmalloc_display_info_heap(xbt_mheap_t h){
 
 }  
-  
-