X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c04d8355923f8323a1a3195fe3b73ac08b984ea..08d324beef1e0fa723013987a98ed7740d2f8343:/src/xbt/mmalloc/mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index d126d185f8..f7d0f71fd2 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -7,71 +7,74 @@
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
 
 #include "mmprivate.h"
+#include "gras_config.h"
+#include <math.h>
 
-static void *__mmalloc_current_heap=NULL; /* The heap we are currently using. */
 
-void* mmalloc_get_current_heap(void) {
+/* 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;
+
+
+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) {
-  __mmalloc_current_heap=new_heap;
+
+void mmalloc_set_current_heap(xbt_mheap_t new_heap)
+{
+  __mmalloc_current_heap = new_heap;
 }
 
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
-void *malloc(size_t n) {
-  void *ret = mmalloc(__mmalloc_current_heap, n);
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+void *malloc(size_t n)
+{
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+  LOCK(mdp);
+  void *ret = mmalloc(mdp, n);
+  UNLOCK(mdp);
 
   return ret;
 }
 
-void *calloc(size_t nmemb, size_t size) {
-  size_t total_size = nmemb * size;
+void *calloc(size_t nmemb, size_t size)
+{
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
 
-  void *ret = mmalloc(__mmalloc_current_heap, total_size);
+  LOCK(mdp);
+  void *ret = mmalloc(mdp, nmemb*size);
+  UNLOCK(mdp);
+  memset(ret, 0, nmemb * size);
 
-  /* 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 *realloc(void *p, size_t s)
+{
   void *ret = NULL;
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
 
-  if (s) {
-    if (p)
-      ret = mrealloc(__mmalloc_current_heap, p,s);
-    else
-      ret = mmalloc(__mmalloc_current_heap,s);
-  } else {
-    if (p)
-      mfree(__mmalloc_current_heap,p);
-  }
+  LOCK(mdp);
+  ret = mrealloc(mdp, p, s);
+  UNLOCK(mdp);
 
   return ret;
 }
 
-void free(void *p) {
-  return mfree(__mmalloc_current_heap, p);
+void free(void *p)
+{
+  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 */
 
-#define HEAP_OFFSET   40960000    /* Safety gap from the heap's break address */
-
-void *mmalloc_get_default_md(void) {
-  xbt_assert(__mmalloc_default_mdp);
-  return __mmalloc_default_mdp;
-}
-
-/* Initialize the default malloc descriptor. */
-#include "xbt_modinter.h"
-void mmalloc_preinit(void) {
-  __mmalloc_default_mdp = mmalloc_attach(-1, (char *)sbrk(0) + HEAP_OFFSET);
-  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);
-}