[mc] Forgot to decrease the page refcounts when freeing a snapshot

[simgrid.git] / src / mc / mc_page_store.cpp

diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp
index ba917a1..b6ba6f7 100644 (file)
--- a/src/mc/mc_page_store.cpp
+++ b/src/mc/mc_page_store.cpp
@@ -18,12 +18,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc,
                                 "Logging specific to mc_page_snapshot");
 
-extern "C" {
-
-static void mc_read_pagemap(uint64_t* pagemap, size_t page_start, size_t page_count);
-
-}
-
 // ***** Utility:
 
 /** @brief Compte a hash for the given memory page
@@ -34,7 +28,8 @@ static void mc_read_pagemap(uint64_t* pagemap, size_t page_start, size_t page_co
  *  @param data Memory page
  *  @return hash off the page
  */
-static inline uint64_t mc_hash_page(const void* data)
+static inline  __attribute__ ((always_inline))
+uint64_t mc_hash_page(const void* data)
 {
   const uint64_t* values = (const uint64_t*) data;
   size_t n = xbt_pagesize / sizeof(uint64_t);
@@ -55,7 +50,7 @@ s_mc_pages_store::s_mc_pages_store(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_SHARED|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
+  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.");
   }
@@ -73,18 +68,19 @@ s_mc_pages_store::~s_mc_pages_store()
 
 void s_mc_pages_store::resize(size_t size)
 {
+  size_t old_bytesize = this->capacity_ << xbt_pagebits;
   size_t new_bytesize = size << xbt_pagebits;
 
   // Expand the memory region by moving it into another
   // virtual memory address if necessary:
-  void* new_memory = mremap(this->memory_, this->capacity_ << xbt_pagesize, new_bytesize, MREMAP_MAYMOVE);
+  void* new_memory = mremap(this->memory_, old_bytesize, new_bytesize, MREMAP_MAYMOVE);
   if (new_memory == MAP_FAILED) {
     xbt_die("Could not mremap snapshot pages.");
   }
 
   this->capacity_ = size;
   this->memory_ = new_memory;
-  this->page_counts_.resize(size);
+  this->page_counts_.resize(size, 0);
 }
 
 /** Allocate a free page
@@ -96,7 +92,7 @@ size_t s_mc_pages_store::alloc_page()
   if (this->free_pages_.empty()) {
 
     // Expand the region:
-    if (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_);
     }
@@ -117,7 +113,7 @@ size_t s_mc_pages_store::alloc_page()
 void s_mc_pages_store::remove_page(size_t pageno)
 {
   this->free_pages_.push_back(pageno);
-  void* page = mc_page_from_number(this->memory_, pageno);
+  const void* page = this->get_page(pageno);
   uint64_t hash = mc_hash_page(page);
   this->hash_index_[hash].erase(pageno);
 }
@@ -150,6 +146,7 @@ size_t s_mc_pages_store::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();
+  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);
   page_set.insert(pageno);