A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lua platform script
[simgrid.git]
/
src
/
mc
/
mc_memory.c
diff --git
a/src/mc/mc_memory.c
b/src/mc/mc_memory.c
index
71eb7d0
..
64c181c
100644
(file)
--- 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"
#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
+24,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);
+#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 */
/* 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
+39,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);
}
}