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

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 769f948288..64c181cd69 100644
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -1,11 +1,13 @@
+/* Copyright (c) 2008-2012 Da 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 "mc/mc.h"
-#include "private.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,20 +20,24 @@ void *raw_heap = NULL;          /* memory persistent over the MC rollbacks. Only
 /* 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(raw_heap_fd, (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);
-}
\ No newline at end of file
+    xbt_mheap_destroy(raw_heap);
+}