model-checker : parallel system state comparison for safety MC

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

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 71eb7d0..b10c810 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2008-2013. 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. */
 
 /* 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. */


@@ -8,9 +9,6 @@
 #include "mc/mc.h"
 #include "mc_private.h"
 #include "xbt/log.h"
 #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)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");


@@ -27,9 +25,14 @@ void MC_memory_init()
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 
   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 */
   /* Create the second region a page after the first one ends + safety gap */

-  raw_heap = mmalloc_attach(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());
+  raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());

   xbt_assert(raw_heap != NULL);
   xbt_assert(raw_heap != NULL);

+#endif

 }
 
 /* Finalize the memory subsystem */
 }
 
 /* Finalize the memory subsystem */


@@ -37,5 +40,5 @@ void MC_memory_init()
 void MC_memory_exit(void)
 {
   if (raw_heap)
 void MC_memory_exit(void)
 {
   if (raw_heap)

-    mmalloc_detach(raw_heap);
+    xbt_mheap_destroy(raw_heap);

 }
 }