X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20bbf9b0608d4ab29fb25ab4f795001d0cdca5b5..38125269905f14713309a1fc3cb3dbeb6e664c0f:/src/mc/PageStore.cpp diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp index 7f7e1664c9..9b196b8cde 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -15,8 +15,6 @@ #include "src/mc/mc_mmu.h" -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot"); @@ -39,9 +37,8 @@ PageStore::hash_type mc_hash_page(const void* data) // This djb2: std::uint64_t hash = 5381; - for (std::size_t i = 0; i != n; ++i) { + for (std::size_t i = 0; i != n; ++i) hash = ((hash << 5) + hash) + values[i]; - } return hash; } @@ -54,9 +51,8 @@ PageStore::PageStore(size_t size) : // by relocating it somewhere else in the virtual memory // space: void* memory = ::mmap(nullptr, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0); - if (memory == MAP_FAILED) { + if (memory == MAP_FAILED) xbt_die("Could not mmap initial snapshot pages."); - } this->top_index_ = 0; this->capacity_ = size; @@ -77,9 +73,8 @@ void PageStore::resize(std::size_t size) // 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 (new_memory == MAP_FAILED) xbt_die("Could not mremap snapshot pages."); - } this->capacity_ = size; this->memory_ = new_memory; @@ -95,10 +90,9 @@ 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_++; @@ -234,5 +228,3 @@ XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the sto } #endif /* SIMGRID_TEST */ - -}