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
[mc] Enable MC specific behaviour in replay mode
[simgrid.git]
/
src
/
mc
/
mc_memory.c
diff --git
a/src/mc/mc_memory.c
b/src/mc/mc_memory.c
index
110b848
..
655418d
100644
(file)
--- a/
src/mc/mc_memory.c
+++ b/
src/mc/mc_memory.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
3
. The SimGrid Team.
+/* Copyright (c) 2008-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-14,24
+14,27
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
"Logging specific to MC (memory)");
/* Pointers to each of the heap regions to use */
"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 */
/* 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()
{
/* Create the first region HEAP_OFFSET bytes after the heap break address */
std_heap = mmalloc_get_default_md();
xbt_assert(std_heap != NULL);
void MC_memory_init()
{
/* 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
+#if
0 && defined HAVE_GNU_LD && !defined MMALLOC_WANT_OVERRIDE_LEGACY
/* use the system malloc for the model-checker data */
/* use the system malloc for the model-checker data */
-
raw
_heap = NULL;
+
mc
_heap = NULL;
#else
/* Create the second region a page after the first one ends + safety gap */
#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);
+ mc_heap =
+ xbt_mheap_new_options(-1,
+ (char *) (std_heap) + STD_HEAP_SIZE + xbt_pagesize,
+ 0);
+ xbt_assert(mc_heap != NULL);
#endif
}
#endif
}
@@
-42,6
+45,6
@@
void MC_memory_exit(void)
MC_free_object_info(&mc_binary_info);
MC_free_object_info(&mc_libsimgrid_info);
MC_free_object_info(&mc_binary_info);
MC_free_object_info(&mc_libsimgrid_info);
- if (
raw
_heap)
- xbt_mheap_destroy(
raw
_heap);
+ if (
mc
_heap)
+ xbt_mheap_destroy(
mc
_heap);
}
}