X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/708989f9970b6f37f3ca7c7b568bcbfeaa53867f..d947ff7466b473eeec602007934f8336a9b17f3c:/src/mc/mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 0478629799..64c181cd69 100644
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -8,9 +8,6 @@
 #include "mc/mc.h"
 #include "mc_private.h"
 #include "xbt/log.h"
-#define _GNU_SOURCE
-
-
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");
@@ -18,26 +15,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
 /* 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 */
-/* int raw_heap_fd; */ /* unsued */
 
 /* Initialize the model-checker memory subsystem */
 /* It creates the two heap regions: std_heap and raw_heap */
 void MC_memory_init()
 {
-/* Create the first region HEAP_OFFSET bytes after the heap break address */
+  /* Create the first region HEAP_OFFSET bytes after the heap break address */
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 
-/* Create the second region a page after the first one ends + safety gap */
-/*  raw_heap_fd = shm_open("raw_heap", O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);*/
-  raw_heap = mmalloc_attach(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());
+#ifdef HAVE_GNU_LD
+  /* 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
 }
 
-/* Finish the memory subsystem */
+/* Finalize the memory subsystem */
 #include "xbt_modinter.h"
 void MC_memory_exit(void)
 {
   if (raw_heap)
-    mmalloc_detach(raw_heap);
+    xbt_mheap_destroy(raw_heap);
 }