X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/539916de848562683cf2e5425d5160c2a43f135a..066ae3631a383ef0338cccfb8e153df1c7f13995:/src/mc/mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 655418da53..72f51a9159 100644
--- 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,26 @@ 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()
 {
+  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();
   xbt_assert(std_heap != NULL);
 
-#if 0 && 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)
+  if (mc_heap && mc_heap != std_heap)
     xbt_mheap_destroy(mc_heap);
 }