Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / xbt / mmalloc / mm_legacy.c

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 4fb087a92c8541daea4e4801567a505cd1718492..84a7eb4526a1e0625db14de18018975d335ec0e1 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2022. 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. */
@@ -7,20 +6,16 @@
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
 #define _GNU_SOURCE
 
-#include <stdlib.h>
+#include "mmprivate.h"
 
 #include <dlfcn.h>
-
-#include "src/mc/mc_base.h"
-#include "mmprivate.h"
-#include "src/xbt_modinter.h"
-#include "src/internal_config.h"
 #include <math.h>
-#include "src/mc/mc_protocol.h"
+#include <stdlib.h>
 
 /* ***** Whether to use `mmalloc` of the underlying malloc ***** */
 
 static int __malloc_use_mmalloc;
+int mmalloc_pagesize = 0;
 
 int malloc_use_mmalloc(void)
 {
@@ -43,16 +38,7 @@ 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 HAVE_MC
-
 /* ***** Temporary allocator
  *
  * This is used before we have found the real malloc implementation with dlsym.
@@ -92,13 +78,14 @@ static void* mm_fake_calloc(size_t nmemb, size_t size)
   return mm_fake_malloc(n);
 }
 
-static void* mm_fake_realloc(void *p, size_t s)
+static void* mm_fake_realloc(XBT_ATTRIB_UNUSED void* p, size_t s)
 {
   return mm_fake_malloc(s);
 }
 
-static void mm_fake_free(void *p)
+static void mm_fake_free(XBT_ATTRIB_UNUSED void* p)
 {
+  // Nothing to do
 }
 
 /* Function signatures for the main malloc functions: */
@@ -118,12 +105,12 @@ static int mm_initialized;
 
 /** Constructor functions used to initialize the malloc implementation
  */
-static void __attribute__((constructor(101))) 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 {
@@ -139,6 +126,8 @@ static void __attribute__((constructor(101))) mm_legacy_constructor()
     mm_real_calloc   = dlsym(RTLD_NEXT, "calloc");
 #endif
   }
+  mmalloc_pagesize = getpagesize();
+
   mm_initializing = 0;
   mm_initialized = 1;
 }
@@ -154,28 +143,6 @@ static void __attribute__((constructor(101))) 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) {
@@ -267,4 +234,3 @@ void free(void *p)
   mfree(mdp, p);
   UNLOCK(mdp);
 }
-#endif /* HAVE_MC */