X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a54b6d1aef3110883b46f912b3a4eeb5c9fb087..c74d55b12793e78341f96550544c4a4061b714ca:/src/mc/mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 82b4b51b0b..6d9700ebc7 100644
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -1,43 +1,50 @@
-/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2008-2014. 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. */
 
 #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)");
 
 /* Pointers to each of the heap regions to use */
-void *std_heap = NULL;          /* memory erased each time the MC stuff rollbacks to the beginning. Almost everything goes here */
-void *raw_heap = NULL;          /* memory persistent over the MC rollbacks. Only MC stuff should go there */
+xbt_mheap_t std_heap = NULL;          /* memory erased each time the MC stuff rollbacks to the beginning. Almost everything goes here */
+xbt_mheap_t mc_heap = NULL;           /* memory persistent over the MC rollbacks. Only MC stuff should go there */
 
 /* Initialize the model-checker memory subsystem */
-/* It creates the two heap regions: std_heap and raw_heap */
+/* 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 */
-  raw_heap = NULL;
-#else
   /* Create the second region a page after the first one ends + safety gap */
-  raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());
-  xbt_assert(raw_heap != NULL);
-#endif
+  mc_heap =
+      xbt_mheap_new_options(-1,
+                            (char *) (std_heap) + STD_HEAP_SIZE + xbt_pagesize,
+                            0);
+  xbt_assert(mc_heap != NULL);
 }
 
 /* Finalize the memory subsystem */
 #include "xbt_modinter.h"
 void MC_memory_exit(void)
 {
-  if (raw_heap)
-    xbt_mheap_destroy(raw_heap);
+  if (mc_heap)
+    xbt_mheap_destroy(mc_heap);
 }