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

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index abb2dee..202a2f1 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -64,6 +64,9 @@ static void MC_region_destroy(mc_mem_region_t reg)
 {
   //munmap(reg->data, reg->size);
   xbt_free(reg->data);
 {
   //munmap(reg->data, reg->size);
   xbt_free(reg->data);

+  if (reg->page_numbers) {
+    mc_free_page_snapshot_region(reg->page_numbers, mc_page_count(reg->size));
+  }

   xbt_free(reg);
 }
 
   xbt_free(reg);
 }
 

diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp
index 787815d..b6ba6f7 100644 (file)
--- a/src/mc/mc_page_store.cpp
+++ b/src/mc/mc_page_store.cpp
@@ -113,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 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);
 }
   uint64_t hash = mc_hash_page(page);
   this->hash_index_[hash].erase(pageno);
 }


@@ -146,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();
   // 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);
   void* snapshot_page = (void*) this->get_page(pageno);
   memcpy(snapshot_page, page, xbt_pagesize);
   page_set.insert(pageno);