(wip) Move the MCed public API in the same file

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

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 6d9700e..72f51a9 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -26,8 +26,9 @@ 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));
+  if (!malloc_use_mmalloc()) {
+    xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
+  }
 
   /* Create the first region HEAP_OFFSET bytes after the heap break address */
   std_heap = mmalloc_get_default_md();
@@ -45,6 +46,6 @@ void MC_memory_init()
 #include "xbt_modinter.h"
 void MC_memory_exit(void)
 {
-  if (mc_heap)
+  if (mc_heap && mc_heap != std_heap)
     xbt_mheap_destroy(mc_heap);
 }