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

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 2bced98dd1..3d58ba5929 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,160 +7,216 @@
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
 
 #include "mmprivate.h"
-#include "gras_config.h"
+#include "xbt_modinter.h"
+#include "internal_config.h"
+#include <math.h>
 
-static void *__mmalloc_current_heap = NULL;     /* The heap we are currently using. */
+//#define MM_LEGACY_VERBOSE 1 /* define this to see which version of malloc gets used */
+
+/* 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;
 }
 
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
-void *malloc(size_t n)
-{
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
+
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+#if 0 && defined(HAVE_GNU_LD)
+
+#undef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#include <dlfcn.h>
+
+static void * (*real_malloc) (size_t) = NULL;
+static void * (*real_realloc) (void*,size_t) = NULL;
+static void * (*real_free) (void*) = NULL;
+
+static void mm_gnuld_legacy_init(void) { /* This function is called from mmalloc_preinit(); it works even if it's static because all mm is in mm.c */
+  real_malloc = (void * (*) (size_t)) dlsym(RTLD_NEXT, "malloc");
+  real_realloc = (void * (*) (void*,size_t)) dlsym(RTLD_NEXT, "realloc");
+  real_free = (void * (*) (void*)) dlsym(RTLD_NEXT, "free");
+  __mmalloc_current_heap = __mmalloc_default_mdp;
+} 
+
+/* Hello pimple!
+ * DL needs some memory while resolving the malloc symbol, that is somehow problematic
+ * To that extend, we have a little area here living in .BSS that we return if asked for memory before the malloc is resolved.
+ */
+static int allocated_junk = 0; /* keep track of many blocks of our little area was already given to someone */
+#define JUNK_SIZE 8
+#define MAX_JUNK_AREAS (64 * 1024 / JUNK_SIZE)
+static char junkareas[MAX_JUNK_AREAS][JUNK_SIZE];
+
+/* This version use mmalloc if there is a current heap, or the legacy implem if not */
+static void *malloc_or_calloc(size_t n, int setzero) {
+  xbt_mheap_t mdp = __mmalloc_current_heap;
+  void *ret;
+#ifdef MM_LEGACY_VERBOSE
+  static int warned_raw = 0;
+  static int warned_mmalloc = 0;
 #endif
-  LOCK(mdp);
-  void *ret = mmalloc(mdp, n);
-  UNLOCK(mdp);
 
+  if (mdp) {
+    LOCK(mdp);
+    ret = mmalloc(mdp, n);
+    UNLOCK(mdp);
+    // This was already done by mmalloc:
+    if (mdp->options & XBT_MHEAP_OPTION_MEMSET) {
+      setzero = 0;
+    }
+#ifdef MM_LEGACY_VERBOSE
+    if (!warned_mmalloc) {
+      fprintf(stderr,"Using mmalloc; enabling the model-checker in cmake may have a bad impact on your simulation performance\n");
+      warned_mmalloc = 1;
+    }
+#endif
+  } else if (!real_malloc) {
+      size_t needed_areas = n / JUNK_SIZE;
+      if(needed_areas * JUNK_SIZE != n) needed_areas++;
+      if (allocated_junk+needed_areas>=MAX_JUNK_AREAS) {
+        fprintf(stderr,
+          "Panic: real malloc symbol not resolved yet, and I already gave my little private memory chunk away.\n");
+        exit(1);
+      } else {
+        size_t i = allocated_junk;
+        allocated_junk += needed_areas;
+        ret = junkareas[i];
+      }
+    }
+  else {
+#ifdef MM_LEGACY_VERBOSE
+    if (!warned_raw) {
+      fprintf(stderr,"Using system malloc after interception; you seem to be currently model-checking\n");
+      warned_raw = 1;
+    }
+#endif
+    ret = real_malloc(n);
+  }
+  if (ret && setzero) {
+    memset(ret, 0, n);
+  }
   return ret;
 }
 
-void *calloc(size_t nmemb, size_t size)
+void *malloc(size_t n)
 {
-  size_t total_size = nmemb * size;
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
-#endif
-  LOCK(mdp);
-  void *ret = mmalloc(mdp, total_size);
-  UNLOCK(mdp);
-
-  /* Fill the allocated memory with zeroes to mimic calloc behaviour */
-  memset(ret, '\0', total_size);
+  return malloc_or_calloc(n, 0);
+}
 
-  return ret;
+void *calloc(size_t nmemb, size_t size)
+{
+  return malloc_or_calloc(nmemb*size, 1);
 }
 
 void *realloc(void *p, size_t s)
 {
-  void *ret = NULL;
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_MMAP
-  if (!mdp)
-    mmalloc_preinit();
-#endif
-  LOCK(mdp);
-  if (s) {
-    if (p)
-      ret = mrealloc(mdp, p, s);
-    else
-      ret = mmalloc(mdp, s);
+  xbt_mheap_t mdp = __mmalloc_current_heap;
+  void *ret;
+
+  if (mdp) {
+    LOCK(mdp);
+    ret = mrealloc(mdp, p, s);
+    UNLOCK(mdp);
   } else {
-    if (p)
-      mfree(mdp, p);
+    ret = real_realloc(p,s);
   }
-  UNLOCK(mdp);
 
   return ret;
 }
 
 void free(void *p)
 {
-  void *mdp = __mmalloc_current_heap;
-#ifdef HAVE_GTNETS
-  if(!mdp) return;
-#endif
-  LOCK(mdp);
-  mfree(mdp, p);
-  UNLOCK(mdp);
-}
-#endif
-
-/* Make sure it works with md==NULL */
+  if (p==NULL)
+    return;
+  if (p<(void*)junkareas || p>=(void*)(junkareas[MAX_JUNK_AREAS]) ) {
+    // main use case
 
-/* 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)
+    xbt_mheap_t mdp = __mmalloc_current_heap;
 
-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){
+    if (mdp) {
       LOCK(mdp);
-      if(mdp->fd >= 0){
-        mdp->refcount++;
-      }
-      mdp = mdp->next_mdesc;
+      mfree(mdp, p);
+      UNLOCK(mdp);
+    } else {
+      real_free(p);
+    }
+  } else {
+    // We are in the junkarea.
+    // This area is used to allocate memory at initilization time.
+
+    if(allocated_junk && p==junkareas[allocated_junk-1]) {
+      // Last junkarea. We can reuse it.
+      allocated_junk--;
+    } else {
+      // We currently cannot reuse freed junkareas in the general case.
     }
   }
 }
 
-static void mmalloc_fork_parent(void)
+
+#else /* NO GNU_LD */
+void *malloc(size_t n)
 {
-  struct mdesc* mdp = NULL;
-  if ((mdp =__mmalloc_default_mdp)){
-    while(mdp){
-      if(mdp->fd < 0)
-        UNLOCK(mdp);
-      mdp = mdp->next_mdesc;
-    }
-  }
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+  LOCK(mdp);
+  void *ret = mmalloc(mdp, n);
+  UNLOCK(mdp);
+
+
+  return ret;
 }
 
-static void mmalloc_fork_child(void)
+void *calloc(size_t nmemb, size_t size)
 {
-  struct mdesc* mdp = NULL;
-  if ((mdp =__mmalloc_default_mdp)){
-    while(mdp){
-      UNLOCK(mdp);
-      mdp = mdp->next_mdesc;
-    }
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+  LOCK(mdp);
+  void *ret = mmalloc(mdp, nmemb*size);
+  UNLOCK(mdp);
+
+  // This was already done in the callee:
+  if(!(mdp->options & XBT_MHEAP_OPTION_MEMSET)) {
+    memset(ret, 0, nmemb * size);
   }
+
+  return ret;
 }
 
-/* Initialize the default malloc descriptor. */
-void mmalloc_preinit(void)
+void *realloc(void *p, size_t s)
 {
-  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 *ret = NULL;
+  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+  LOCK(mdp);
+  ret = mrealloc(mdp, p, s);
+  UNLOCK(mdp);
+
+  return ret;
 }
 
-void mmalloc_postexit(void)
+void free(void *p)
 {
-  /* 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);
+  if (p != NULL) {
+    xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+    LOCK(mdp);
+    mfree(mdp, p);
+    UNLOCK(mdp);
+  }
 }
+#endif /* NO GNU_LD */
+#endif /* WANT_MALLOC_OVERRIDE */