X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..d947ff7466b473eeec602007934f8336a9b17f3c:/src/mc/mc_memory.c?ds=sidebyside diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c index 7b191a9348..64c181cd69 100644 --- a/src/mc/mc_memory.c +++ b/src/mc/mc_memory.c @@ -1,15 +1,13 @@ -#include -#include -#include "mc/mc.h" -#include "xbt/sysdep.h" -#include "private.h" -#include "xbt/log.h" -#include -#define _GNU_SOURCE +/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ -extern char *basename(__const char *__filename); +/* 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. */ -#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */ +#include +#include +#include "mc/mc.h" +#include "mc_private.h" +#include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc, "Logging specific to MC (memory)"); @@ -18,125 +16,28 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc, 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 */ -/* Pointers to the beginning and end of the .data and .bss segment of libsimgrid */ -/* They are initialized once at memory_init */ -void *libsimgrid_data_addr_start = NULL; -size_t libsimgrid_data_size = 0; - /* Initialize the model-checker memory subsystem */ -/* It creates the heap regions and set the default one */ +/* 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 */ - raw_heap = - mmalloc_attach(-1, - (char *) (std_heap) + STD_HEAP_SIZE + getpagesize()); +#ifdef HAVE_GNU_LD + /* use the system malloc for the model-checker data */ + raw_heap = NULL; +#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_SET_RAW_MEM; - -/* Get the start address and size of libsimgrid's data segment */ -/* CAVEAT: Here we are assuming that get_memory_map() */ -/* returns an array with the maps sorted from lower addresses to higher ones. */ - int i; - char *libname, *tmp; - - /* Get memory map */ - memory_map_t maps; - maps = get_memory_map(); - - for (i = 0; i < maps->mapsize; i++) { - - if (maps->regions[i].inode != 0) { - - tmp = xbt_strdup(maps->regions[i].pathname); - libname = basename(tmp); - -#if 0 - if (maps->regions[i].perms & MAP_WRITE && maps->regions[i].pathname[0] != '\0' && /* do not take anonymous segments: what are they? */ - strcmp("[heap]", maps->regions[i].pathname) && /* do not take standard heap: mmalloc saves it already */ - strcmp("[stack]", maps->regions[i].pathname) /* this is maestro's stack. No need to save it */ - ) { - /* FIXME: we should save the data of more segments, in a list of block to save */ - } #endif - /* for now, we only save the data of libsimgrid (FIXME) */ - if (strncmp("libsimgrid.so.", libname, 14) == 0 - && maps->regions[i].perms & MAP_WRITE) { - libsimgrid_data_addr_start = maps->regions[i].start_addr; - libsimgrid_data_size = - (size_t) ((char *) maps->regions[i + 1].start_addr - - (char *) maps->regions[i].start_addr); - xbt_free(tmp); - break; - } - xbt_free(tmp); - } - } - - xbt_assert0(libsimgrid_data_addr_start != NULL, - "Cannot determine libsimgrid's .data segment address"); - - MC_UNSET_RAW_MEM; } -/* Finish the memory subsystem */ +/* Finalize the memory subsystem */ #include "xbt_modinter.h" void MC_memory_exit(void) { if (raw_heap) - mmalloc_detach(raw_heap); -} - - -/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */ -/* an API to query about the status of a heap, we simply call mmstats and */ -/* because I now how does structure looks like, then I redefine it here */ - -struct mstats { - size_t bytes_total; /* Total size of the heap. */ - size_t chunks_used; /* Chunks allocated by the user. */ - size_t bytes_used; /* Byte total of user-allocated chunks. */ - size_t chunks_free; /* Chunks in the free list. */ - size_t bytes_free; /* Byte total of chunks in the free list. */ -}; - -extern struct mstats mmstats(void *); - -/* Copy std_heap to "to_heap" allocating the required space for it */ -size_t MC_save_heap(void **to_heap) -{ - size_t heap_size = mmstats(std_heap).bytes_total; - - *to_heap = calloc(heap_size, 1); - - xbt_assert(*to_heap != NULL); - - memcpy(*to_heap, std_heap, heap_size); - - return heap_size; -} - -/* Copy the data segment of libsimgrid to "data" allocating the space for it */ -size_t MC_save_dataseg(void **data) -{ - *data = calloc(libsimgrid_data_size, 1); - memcpy(*data, libsimgrid_data_addr_start, libsimgrid_data_size); - return libsimgrid_data_size; -} - -/* Restore std_heap from "src_heap" */ -void MC_restore_heap(void *src_heap, size_t size) -{ - memcpy(std_heap, src_heap, size); -} - -/* Restore the data segment of libsimgrid from "src_data" */ -void MC_restore_dataseg(void *src_data, size_t size) -{ - memcpy(libsimgrid_data_addr_start, src_data, size); + xbt_mheap_destroy(raw_heap); }