X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56048e3bbbccaeb0c3f1ec9d0105048d7e122af1..e6bc6eb53997f4648bf3207348c060e9f50ee282:/src/mc/mc_memory.c diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c index 0478629799..1950729fcc 100644 --- a/src/mc/mc_memory.c +++ b/src/mc/mc_memory.c @@ -18,26 +18,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc, /* 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 */ -/* int raw_heap_fd; */ /* unsued */ /* Initialize the model-checker memory subsystem */ /* It creates the two heap regions: std_heap and raw_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(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize()); + /* 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); } -/* Finish the memory subsystem */ +/* Finalize the memory subsystem */ #include "xbt_modinter.h" void MC_memory_exit(void) { if (raw_heap) - mmalloc_detach(raw_heap); + xbt_mheap_destroy(raw_heap); }