X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..fd4234eb94e29294081a0732440e5868e561d78b:/src/mc/PageStore.cpp diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp index 05df2a875d..f5d769769a 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -9,17 +9,11 @@ #include -#include - #include -#include "PageStore.hpp" - -#ifdef MC_PAGE_STORE_MD4 -#include -#endif +#include "src/mc/PageStore.hpp" -#include "mc_mmu.h" +#include "src/mc/mc_mmu.h" extern "C" { @@ -40,24 +34,15 @@ namespace mc { static inline __attribute__ ((always_inline)) PageStore::hash_type mc_hash_page(const void* data) { -#ifdef MC_PAGE_STORE_MD4 - boost::array result; - md4_ctx context; - md4_init(&context); - md4_update(&context, xbt_pagesize, (const uint8_t*) data); - md4_digest(&context, MD4_DIGEST_SIZE, (uint8_t*) &(result[0])); - return result; -#else - 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; -#endif } // ***** snapshot_page_manager @@ -68,8 +53,8 @@ PageStore::PageStore(size_t size) : // 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(NULL, 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."); } @@ -84,7 +69,7 @@ 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; @@ -105,7 +90,7 @@ 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()) { @@ -128,20 +113,16 @@ 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); hash_type hash = mc_hash_page(page); -#ifdef MC_PAGE_STORE_MD4 - this->hash_index_.erase(hash); -#else this->hash_index_[hash].erase(pageno); -#endif } /** 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"); @@ -151,21 +132,10 @@ size_t PageStore::store_page(void* page) // 2. find pages with the same hash using `hash_index_`; // 3. find a page with the same content. hash_type hash = mc_hash_page(page); -#ifdef MC_PAGE_STORE_MD4 - s_mc_pages_store::pages_map_type::const_iterator i = - this->hash_index_.find(hash); - if (i!=this->hash_index_.cend()) { - // If a page with the same content is already in the page store it is - // reused and its reference count is incremented. - size_t pageno = i->second; - page_counts_[pageno]++; - return pageno; - } -#else // 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) { @@ -176,19 +146,14 @@ size_t PageStore::store_page(void* page) } } -#endif // 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); -#ifdef MC_PAGE_STORE_MD4 - this->hash_index_[hash] = pageno; -#else page_set.insert(pageno); -#endif page_counts_[pageno]++; return pageno; } @@ -198,21 +163,21 @@ 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() @@ -220,16 +185,16 @@ static void* getpage() return mmap(NULL, 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"); @@ -238,7 +203,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"); @@ -268,8 +233,6 @@ 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 */ }