X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..c587485ee2aae6b2c54ed80656cbdc4e3ba8d157:/src/mc/sosp/PageStore.cpp diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp index e11d6532b4..149e36dc0b 100644 --- a/src/mc/sosp/PageStore.cpp +++ b/src/mc/sosp/PageStore.cpp @@ -26,8 +26,8 @@ namespace mc { /** @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. + * The page is used before inserting the page in the page store in order to find duplicate of this page in the page + * store. * * @param data Memory page * @return hash off the page @@ -50,7 +50,7 @@ static XBT_ALWAYS_INLINE PageStore::hash_type mc_hash_page(const void* data) // ***** snapshot_page_manager -PageStore::PageStore(std::size_t size) : memory_(nullptr), capacity_(size), top_index_(0) +PageStore::PageStore(std::size_t size) : capacity_(size) { // Using mmap in order to be able to expand the region by relocating it somewhere else in the virtual memory space: void* memory = @@ -118,7 +118,6 @@ void PageStore::resize(std::size_t size) std::size_t PageStore::alloc_page() { if (this->free_pages_.empty()) { - // Expand the region: if (this->top_index_ == this->capacity_) // All the pages are allocated, we need add more pages: @@ -126,9 +125,7 @@ std::size_t PageStore::alloc_page() // Use a page from the top: return this->top_index_++; - } else { - // Use a page from free_pages_ (inside of the region): size_t res = this->free_pages_[this->free_pages_.size() - 1]; this->free_pages_.pop_back(); @@ -160,7 +157,6 @@ std::size_t PageStore::store_page(void* page) for (size_t const& pageno : page_set) { const void* snapshot_page = this->get_page(pageno); if (memcmp(page, snapshot_page, xbt_pagesize) == 0) { - // If a page with the same content is already in the page store it's reused and its refcount is incremented. page_counts_[pageno]++; return pageno; @@ -170,7 +166,7 @@ std::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. 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); + void* snapshot_page = this->get_page(pageno); memcpy(snapshot_page, page, xbt_pagesize); page_set.insert(pageno); page_counts_[pageno]++;