X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30a8caef3dfc5c6b5e39a3fbbd6bb110d8036486..1810d57c2b26e27fc5e880e65fcc57f41345249e:/src/mc/PageStore.cpp diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp index e8c74acd65..78f28e68fc 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -5,19 +5,20 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include // memcpy, memcp +#include // memcpy, memcmp #include +#ifdef __FreeBSD__ +# define MAP_POPULATE MAP_PREFAULT_READ +#endif -#include +#include +#include +#include -#include +#include "src/mc/PageStore.hpp" -#include "PageStore.hpp" - -#include "mc_mmu.h" - -extern "C" { +#include "src/mc/mc_mmu.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot"); @@ -25,7 +26,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, namespace simgrid { namespace mc { -/** @brief Compte a hash for the given memory page +/** @brief Compute a hash for the given memory page * * The page is used before inserting the page in the page store * in order to find duplicate of this page in the page store. @@ -36,29 +37,27 @@ namespace mc { static inline __attribute__ ((always_inline)) PageStore::hash_type mc_hash_page(const void* data) { - const uint64_t* values = (const uint64_t*) data; - size_t n = xbt_pagesize / sizeof(uint64_t); + const std::uint64_t* values = (const uint64_t*) data; + std::size_t n = xbt_pagesize / sizeof(uint64_t); // This djb2: - uint64_t hash = 5381; - for (size_t i=0; i!=n; ++i) { + std::uint64_t hash = 5381; + for (std::size_t i = 0; i != n; ++i) hash = ((hash << 5) + hash) + values[i]; - } return hash; } // ***** snapshot_page_manager PageStore::PageStore(size_t size) : - memory_(NULL), capacity_(0), top_index_(0) + memory_(nullptr), capacity_(0), top_index_(0) { // Using mmap in order to be able to expand the region // by relocating it somewhere else in the virtual memory // space: - void * memory = ::mmap(NULL, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0); - if (memory==MAP_FAILED) { + void* memory = ::mmap(nullptr, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0); + if (memory == MAP_FAILED) xbt_die("Could not mmap initial snapshot pages."); - } this->top_index_ = 0; this->capacity_ = size; @@ -71,17 +70,50 @@ PageStore::~PageStore() ::munmap(this->memory_, this->capacity_ << xbt_pagebits); } -void PageStore::resize(size_t size) +void PageStore::resize(std::size_t size) { size_t old_bytesize = this->capacity_ << xbt_pagebits; size_t new_bytesize = size << xbt_pagebits; + void *new_memory; // Expand the memory region by moving it into another // virtual memory address if necessary: - void* new_memory = mremap(this->memory_, old_bytesize, new_bytesize, MREMAP_MAYMOVE); - if (new_memory == MAP_FAILED) { +#if HAVE_MREMAP + new_memory = mremap(this->memory_, old_bytesize, new_bytesize, MREMAP_MAYMOVE); + if (new_memory == MAP_FAILED) xbt_die("Could not mremap snapshot pages."); +#else + if (new_bytesize > old_bytesize) { + // Grow: first try to add new space after current map + new_memory = mmap((char *)this->memory_ + old_bytesize, + new_bytesize-old_bytesize, + PROT_READ|PROT_WRITE, + MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, + -1, 0); + if (new_memory == MAP_FAILED) + xbt_die("Could not mremap snapshot pages."); + // Check if expanding worked + if (new_memory != (char *)this->memory_ + old_bytesize) { + // New memory segment could not be put at the end of this->memory_, + // so cancel this one and try to rellocate everything and copy data + munmap(new_memory, new_bytesize-old_bytesize); + new_memory = mmap(nullptr, + new_bytesize, + PROT_READ|PROT_WRITE, + MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, + -1, 0); + if (new_memory == MAP_FAILED) + xbt_die("Could not mremap snapshot pages."); + memcpy(new_memory, this->memory_, old_bytesize); + munmap(this->memory_, old_bytesize); + } + } + else { + // We don't have functions to shrink a mapping, so leave memory as + // it is for now + new_memory = this->memory_; } +#endif this->capacity_ = size; this->memory_ = new_memory; @@ -92,15 +124,14 @@ void PageStore::resize(size_t size) * * @return index of the free page */ -size_t PageStore::alloc_page() +std::size_t PageStore::alloc_page() { if (this->free_pages_.empty()) { // Expand the region: - if (this->top_index_ == this->capacity_) { + if (this->top_index_ == this->capacity_) // All the pages are allocated, we need add more pages: this->resize(2 * this->capacity_); - } // Use a page from the top: return this->top_index_++; @@ -115,7 +146,7 @@ size_t PageStore::alloc_page() } } -void PageStore::remove_page(size_t pageno) +void PageStore::remove_page(std::size_t pageno) { this->free_pages_.push_back(pageno); const void* page = this->get_page(pageno); @@ -124,7 +155,7 @@ void PageStore::remove_page(size_t pageno) } /** Store a page in memory */ -size_t PageStore::store_page(void* page) +std::size_t PageStore::store_page(void* page) { xbt_assert(top_index_ <= this->capacity_, "top_index is not consistent"); @@ -137,7 +168,7 @@ size_t PageStore::store_page(void* page) // Try to find a duplicate in set of pages with the same hash: page_set_type& page_set = this->hash_index_[hash]; - BOOST_FOREACH (size_t pageno, page_set) { + for (size_t pageno : page_set) { const void* snapshot_page = this->get_page(pageno); if (memcmp(page, snapshot_page, xbt_pagesize) == 0) { @@ -151,7 +182,7 @@ size_t PageStore::store_page(void* page) // Otherwise, a new page is allocated in the page store and the content // of the page is `memcpy()`-ed to this new page. - size_t pageno = alloc_page(); + std::size_t pageno = alloc_page(); xbt_assert(this->page_counts_[pageno]==0, "Allocated page is already used"); void* snapshot_page = (void*) this->get_page(pageno); memcpy(snapshot_page, page, xbt_pagesize); @@ -165,38 +196,38 @@ size_t PageStore::store_page(void* page) #ifdef SIMGRID_TEST -#include -#include -#include +#include +#include + #include #include #include -#include "mc/PageStore.hpp" +#include "src/mc/PageStore.hpp" static int value = 0; -static void new_content(void* data, size_t size) +static void new_content(void* data, std::size_t size) { - memset(data, ++value, size); + ::memset(data, ++value, size); } static void* getpage() { - return mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + return mmap(nullptr, getpagesize(), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); } -extern "C" { - XBT_TEST_SUITE("mc_page_store", "Page store"); XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the store") { + using simgrid::mc::PageStore; + xbt_test_add("Init"); - size_t pagesize = (size_t) getpagesize(); - std::unique_ptr store - = std::unique_ptr(new simgrid::mc::PageStore(500)); + std::size_t pagesize = (size_t) getpagesize(); + std::unique_ptr store + = std::unique_ptr(new simgrid::mc::PageStore(500)); void* data = getpage(); xbt_test_assert(store->size()==0, "Bad size"); @@ -205,7 +236,7 @@ XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the sto size_t pageno1 = store->store_page(data); xbt_test_assert(store->get_ref(pageno1)==1, "Bad refcount"); const void* copy = store->get_page(pageno1); - xbt_test_assert(memcmp(data, copy, pagesize)==0, "Page data should be the same"); + xbt_test_assert(::memcmp(data, copy, pagesize)==0, "Page data should be the same"); xbt_test_assert(store->size()==1, "Bad size"); xbt_test_add("Store the same page again"); @@ -235,8 +266,4 @@ XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the sto xbt_test_assert(store->size()==2, "Bad size"); } -} - #endif /* SIMGRID_TEST */ - -}