[mc] Bug: MC was reading from the wrong region

[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 787815d..cac7e0f 100644 (file)
--- a/src/mc/mc_page_store.cpp
+++ b/src/mc/mc_page_store.cpp
@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <string.h> // memcpy, memcp
 
+#include <sys/mman.h>
+
 #include <boost/foreach.hpp>
 
 #include <xbt.h>
@@ -113,7 +115,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);
 }
@@ -146,6 +148,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);