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

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 5afb74a1a5..f5b05ad472 100644
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
+/* Copyright (c) 2010-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,9 +13,8 @@
 
 #include "mmprivate.h"
 #include "src/internal_config.h"
-#include "src/mc/mc_base.h"
 #include "src/mc/remote/mc_protocol.h"
-#include "src/xbt_modinter.h"
+#include "xbt/xbt_modinter.h"
 #include <math.h>
 
 /* ***** Whether to use `mmalloc` of the underlying malloc ***** */
@@ -43,13 +42,6 @@ xbt_mheap_t mmalloc_get_current_heap(void)
   return __mmalloc_current_heap;
 }
 
-xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap)
-{
-  xbt_mheap_t heap = __mmalloc_current_heap;
-  __mmalloc_current_heap = new_heap;
-  return heap;
-}
-
 /* Override the malloc-like functions if MC is activated at compile time */
 #if SIMGRID_HAVE_MC
 
@@ -119,12 +111,12 @@ static int mm_initialized;
 
 /** Constructor functions used to initialize the malloc implementation
  */
-_XBT_GNUC_CONSTRUCTOR(101) static void mm_legacy_constructor()
+XBT_ATTRIB_CONSTRUCTOR(101) static void mm_legacy_constructor()
 {
   if (mm_initialized)
     return;
   mm_initializing = 1;
-  __malloc_use_mmalloc = getenv(MC_ENV_VARIABLE) ? 1 : 0;
+  __malloc_use_mmalloc = getenv(MC_ENV_SOCKET_FD) ? 1 : 0;
   if (__malloc_use_mmalloc) {
     __mmalloc_current_heap = mmalloc_preinit();
   } else {
@@ -155,28 +147,6 @@ _XBT_GNUC_CONSTRUCTOR(101) static void mm_legacy_constructor()
 
 #define GET_HEAP() __mmalloc_current_heap
 
-void* malloc_no_memset(size_t n)
-{
-  if (!mm_initialized) {
-    if (mm_initializing)
-      return mm_fake_malloc(n);
-    mm_legacy_constructor();
-  }
-
-  if (!__malloc_use_mmalloc) {
-    return mm_real_malloc(n);
-  }
-
-  xbt_mheap_t mdp = GET_HEAP();
-  if (!mdp)
-    return NULL;
-
-  LOCK(mdp);
-  void *ret = mmalloc_no_memset(mdp, n);
-  UNLOCK(mdp);
-  return ret;
-}
-
 void *malloc(size_t n)
 {
   if (!mm_initialized) {