+/* Copyright (c) 2008-2014. 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. */
+
#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)");
/* 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 */
-/* 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 */
+ /* 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());
- xbt_assert(raw_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
}
-/* 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
+ MC_free_object_info(&mc_binary_info);
+ MC_free_object_info(&mc_libsimgrid_info);
+
+ if (mc_heap)
+ xbt_mheap_destroy(mc_heap);
+}
