[mc] Enable the custom mm malloc only in MC

[simgrid.git] / src / mc / mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 77d9284..6d9700e 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -6,9 +6,14 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
+
+#include "xbt/log.h"
+#include "xbt/dynar.h"
+#include "xbt/virtu.h"
+
 #include "mc/mc.h"
+#include "mc_object_info.h"
 #include "mc_private.h"
-#include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");
@@ -21,30 +26,25 @@ xbt_mheap_t mc_heap = NULL;           /* memory persistent over the MC rollbacks
 /* It creates the two heap regions: std_heap and mc_heap */
 void MC_memory_init()
 {
+  mmalloc_ensure_using_mm(
+    xbt_dynar_length(xbt_cmdline), xbt_dynar_get_ptr(xbt_cmdline, 0));
+
   /* Create the first region HEAP_OFFSET bytes after the heap break address */
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 
-#if defined HAVE_GNU_LD && !defined MMALLOC_WANT_OVERRIDE_LEGACY
-  /* use the system malloc for the model-checker data */
-  mc_heap = NULL;
-#else
   /* Create the second region a page after the first one ends + safety gap */
   mc_heap =
       xbt_mheap_new_options(-1,
                             (char *) (std_heap) + STD_HEAP_SIZE + xbt_pagesize,
                             0);
   xbt_assert(mc_heap != NULL);
-#endif
 }
 
 /* Finalize the memory subsystem */
 #include "xbt_modinter.h"
 void MC_memory_exit(void)
 {
-  MC_free_object_info(&mc_binary_info);
-  MC_free_object_info(&mc_libsimgrid_info);
-
   if (mc_heap)
     xbt_mheap_destroy(mc_heap);
 }