X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b0aa1525597fd0800c4d00c6df3f3c49d53ee2c..612f154fb83700bd9c58a2e72c2ce7d98db81824:/src/mc/sosp/PageStore.cpp

diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp
index a81248dc67..bc102911a3 100644
--- a/src/mc/sosp/PageStore.cpp
+++ b/src/mc/sosp/PageStore.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -49,7 +48,7 @@ static XBT_ALWAYS_INLINE PageStore::hash_type mc_hash_page(const void* data)
 
 // ***** snapshot_page_manager
 
-PageStore::PageStore(size_t size) : memory_(nullptr), capacity_(size), top_index_(0)
+PageStore::PageStore(std::size_t size) : memory_(nullptr), capacity_(size), top_index_(0)
 {
   // Using mmap in order to be able to expand the region by relocating it somewhere else in the virtual memory space:
   void* memory =
@@ -178,76 +177,3 @@ std::size_t PageStore::store_page(void* page)
 
 } // namespace mc
 } // namespace simgrid
-
-#ifdef SIMGRID_TEST
-
-#include <cstdint>
-#include <cstring>
-
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <memory>
-
-#include "src/mc/PageStore.hpp"
-
-static int value = 0;
-
-static void new_content(void* data, std::size_t size)
-{
-  ::memset(data, ++value, size);
-}
-
-static void* getpage()
-{
-  return mmap(nullptr, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-}
-
-XBT_TEST_SUITE("mc_page_store", "Page store");
-
-XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the store")
-{
-  using simgrid::mc::PageStore;
-
-  xbt_test_add("Init");
-  std::size_t pagesize             = (size_t)getpagesize();
-  std::unique_ptr<PageStore> store = std::unique_ptr<PageStore>(new simgrid::mc::PageStore(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 */