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

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 9ae3771bef..b5457e1649 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -1,15 +1,22 @@
-/* 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
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+
+#include <dlfcn.h>
 
 #include "mmprivate.h"
+#include "xbt_modinter.h"
 #include "internal_config.h"
 #include <math.h>
 
+//#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
@@ -31,52 +38,132 @@ void mmalloc_set_current_heap(xbt_mheap_t new_heap)
 }
 
 #ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+
+/* Fake implementations, they are used to fool dlsym:
+ * dlsym used calloc and falls back to some other mechanism
+ * if this fails.
+ */
+static void* mm_fake_calloc(size_t nmemb, size_t size) { return NULL; }
+static void* mm_fake_malloc(size_t n)                  { return NULL; }
+static void* mm_fake_realloc(void *p, size_t s)        { return NULL; }
+
+/* Function signatures for the main malloc functions: */
+typedef void* (*mm_malloc_t)(size_t size);
+typedef void  (*mm_free_t)(void*);
+typedef void* (*mm_calloc_t)(size_t nmemb, size_t size);
+typedef void* (*mm_realloc_t)(void *ptr, size_t size);
+
+/* Function pointers to the real/next implementations: */
+static mm_malloc_t mm_real_malloc   = mm_fake_malloc;
+static mm_free_t mm_real_free;
+static mm_calloc_t mm_real_calloc   = mm_fake_calloc;
+static mm_realloc_t mm_real_realloc = mm_fake_realloc;
+
+#define GET_HEAP() __mmalloc_current_heap
+
+static const char* env_name = "SIMGRID_MALLOC_USE_MM";
+
+int mmalloc_exec_using_mm(int argc, const char** argv)
+{
+  char** argv2 = (char**) malloc(sizeof(char*) * (argc+1));
+  memcpy(argv2, argv, sizeof(char*) * argc);
+  argv2[argc] = NULL;
+  if (setenv(env_name, "1", 1) >= 0) {
+    execv(argv[0], argv2);
+  }
+  unsetenv(env_name);
+  fprintf(stderr, "Could not restart with mm malloc\n");
+  free(argv2);
+  return -1;
+}
+
+void mmalloc_ensure_using_mm(int argc, const char** argv)
+{
+  if (!__mmalloc_default_mdp) {
+    mmalloc_exec_using_mm(argc, argv);
+  }
+}
+
+/** Constructor functions used to initialize the malloc implementation
+ */
+static void __attribute__((constructor(101))) mm_legacy_constructor()
+{
+  bool use_mm = getenv(env_name);
+  if (use_mm) {
+    __mmalloc_current_heap = mmalloc_preinit();
+  } else {
+    mm_real_realloc  = (mm_realloc_t) dlsym(RTLD_NEXT, "realloc");
+    mm_real_malloc   = (mm_malloc_t)  dlsym(RTLD_NEXT, "malloc");
+    mm_real_free     = (mm_free_t)    dlsym(RTLD_NEXT, "free");
+    mm_real_calloc   = (mm_calloc_t)  dlsym(RTLD_NEXT, "calloc");
+  }
+}
+
 void *malloc(size_t n)
 {
-  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+  if (!__mmalloc_current_heap) {
+    return mm_real_malloc(n);
+  }
+
+  xbt_mheap_t mdp = GET_HEAP();
+  if (!mdp)
+    return NULL;
 
   LOCK(mdp);
   void *ret = mmalloc(mdp, n);
   UNLOCK(mdp);
-
   return ret;
 }
 
 void *calloc(size_t nmemb, size_t size)
 {
-  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+  if (!__mmalloc_current_heap) {
+    return mm_real_calloc(nmemb, size);
+  }
+
+  xbt_mheap_t mdp = GET_HEAP();
+  if (!mdp)
+    return NULL;
 
   LOCK(mdp);
   void *ret = mmalloc(mdp, nmemb*size);
   UNLOCK(mdp);
-  memset(ret, 0, nmemb * size);
-
-
+  // This was already done in the callee:
+  if(!(mdp->options & XBT_MHEAP_OPTION_MEMSET)) {
+    memset(ret, 0, nmemb * size);
+  }
   return ret;
 }
 
 void *realloc(void *p, size_t s)
 {
-  void *ret = NULL;
-  xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+  if (!__mmalloc_current_heap) {
+    return mm_real_realloc(p, s);
+  }
+
+  xbt_mheap_t mdp = GET_HEAP();
+  if (!mdp)
+    return NULL;
 
   LOCK(mdp);
-  ret = mrealloc(mdp, p, s);
+  void* ret = mrealloc(mdp, p, s);
   UNLOCK(mdp);
-
   return ret;
 }
 
 void free(void *p)
 {
-  if (p != NULL) {
-    xbt_mheap_t mdp = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+  if (!p)
+    return;
 
-    LOCK(mdp);
-    mfree(mdp, p);
-    UNLOCK(mdp);
+  if (!__mmalloc_current_heap) {
+    mm_real_free(p);
+    return;
   }
-}
-#endif
-
 
+  xbt_mheap_t mdp = GET_HEAP();
+  LOCK(mdp);
+  mfree(mdp, p);
+  UNLOCK(mdp);
+}
+#endif /* WANT_MALLOC_OVERRIDE */