#include <sys/stat.h>
#include <fcntl.h>
+
+#include "xbt/log.h"
+#include "xbt/dynar.h"
+#include "xbt/virtu.h"
+
#include "mc/mc.h"
+#include "mc_object_info.h"
#include "mc_private.h"
-#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
"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 *mc_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 */
/* It creates the two heap regions: std_heap and mc_heap */
void MC_memory_init()
{
+ if (!malloc_use_mmalloc()) {
+ xbt_die("Model-checking support is not enabled: run with simgrid-mc.");
+ }
+
/* 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
- /* use the system malloc for the model-checker data */
- mc_heap = NULL;
-#else
/* Create the second region a page after the first one ends + safety gap */
mc_heap =
xbt_mheap_new_options(-1,
(char *) (std_heap) + STD_HEAP_SIZE + xbt_pagesize,
0);
xbt_assert(mc_heap != NULL);
-#endif
}
/* Finalize the memory subsystem */
#include "xbt_modinter.h"
void MC_memory_exit(void)
{
- MC_free_object_info(&mc_binary_info);
- MC_free_object_info(&mc_libsimgrid_info);
-
- if (mc_heap)
+ if (mc_heap && mc_heap != std_heap)
xbt_mheap_destroy(mc_heap);
}