XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
"Logging specific to MC (memory)");
/* Pointers to each of the heap regions to use */
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 */
/* 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 first region HEAP_OFFSET bytes after the heap break address */
std_heap = mmalloc_get_default_md();
xbt_assert(std_heap != NULL);
- raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());
- xbt_assert(raw_heap != NULL);
-#endif
+ mc_heap =
+ xbt_mheap_new_options(-1,
+ (char *) (std_heap) + STD_HEAP_SIZE + xbt_pagesize,
+ 0);
+ xbt_assert(mc_heap != NULL);
}
/* Finalize the memory subsystem */
#include "xbt_modinter.h"
void MC_memory_exit(void)
{
}
/* 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 (raw_heap)
- xbt_mheap_destroy(raw_heap);
+ if (mc_heap && mc_heap != std_heap)
+ xbt_mheap_destroy(mc_heap);