X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff653c762c0cedfa56f7febfe84b50325ec64585..f82324570da0d9e5ada9db953e969b760e9b7016:/src/mc/mc_page_store.cpp?ds=sidebyside

diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp
index 787815d0c4..a2072b39c3 100644
--- 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);
@@ -162,4 +165,84 @@ mc_pages_store_t mc_pages_store_new()
   return new s_mc_pages_store_t(500);
 }
 
+void mc_pages_store_delete(mc_pages_store_t store)
+{
+  delete store;
+}
+
+}
+
+#ifdef SIMGRID_TEST
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#include <memory>
+
+#include "mc/mc_page_store.h"
+
+static int value = 0;
+
+static void new_content(void* data, size_t size)
+{
+  memset(data, ++value, size);
 }
+
+static void* getpage()
+{
+  return mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+}
+
+extern "C" {
+
+XBT_TEST_SUITE("mc_page_store", "Page store");
+
+XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the store")
+{
+  xbt_test_add("Init");
+  size_t pagesize = (size_t) getpagesize();
+  std::auto_ptr<s_mc_pages_store_t> store = std::auto_ptr<s_mc_pages_store_t>(new s_mc_pages_store(500));
+  void* data = getpage();
+  xbt_test_assert(store->size()==0, "Bad size");
+
+  xbt_test_add("Store the page once");
+  new_content(data, pagesize);
+  size_t pageno1 = store->store_page(data);
+  xbt_test_assert(store->get_ref(pageno1)==1, "Bad refcount");
+  const void* copy = store->get_page(pageno1);
+  xbt_test_assert(memcmp(data, copy, pagesize)==0, "Page data should be the same");
+  xbt_test_assert(store->size()==1, "Bad size");
+
+  xbt_test_add("Store the same page again");
+  size_t pageno2 = store->store_page(data);
+  xbt_test_assert(pageno1==pageno2, "Page should be the same");
+  xbt_test_assert(store->get_ref(pageno1)==2, "Bad refcount");
+  xbt_test_assert(store->size()==1, "Bad size");
+
+  xbt_test_add("Store a new page");
+  new_content(data, pagesize);
+  size_t pageno3 = store->store_page(data);
+  xbt_test_assert(pageno1 != pageno3, "New page should be different");
+  xbt_test_assert(store->size()==2, "Bad size");
+
+  xbt_test_add("Unref pages");
+  store->unref_page(pageno1);
+  xbt_assert(store->get_ref(pageno1)==1, "Bad refcount");
+  xbt_assert(store->size()==2, "Bad size");
+  store->unref_page(pageno2);
+  xbt_test_assert(store->size()==1, "Bad size");
+
+  xbt_test_add("Reallocate page");
+  new_content(data, pagesize);
+  size_t pageno4 = store->store_page(data);
+  xbt_test_assert(pageno1 == pageno4, "Page was not reused");
+  xbt_test_assert(store->get_ref(pageno4)==1, "Bad refcount");
+  xbt_test_assert(store->size()==2, "Bad size");
+}
+
+}
+
+#endif /* SIMGRID_TEST */