[mc] Move page store test from the integration test into the unit test infrastructure

diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake
index 7800769..95ee93f 100644 (file)
--- a/buildtools/Cmake/UnitTesting.cmake
+++ b/buildtools/Cmake/UnitTesting.cmake
@@ -28,6 +28,13 @@ set(TEST_UNITS
   ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c
   )
 
+if(HAVE_MC)
+  set(TEST_CFILES ${TEST_CFILES}
+      src/mc/mc_page_store.cpp)
+  set(TEST_UNITS ${TEST_UNITS}
+     ${CMAKE_CURRENT_BINARY_DIR}/src/mc_page_store_unit.cpp)
+endif()
+
 ADD_CUSTOM_COMMAND(
   OUTPUT       ${TEST_UNITS}
 

diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp
index cac7e0f..f728746 100644 (file)
--- a/src/mc/mc_page_store.cpp
+++ b/src/mc/mc_page_store.cpp
@@ -166,3 +166,78 @@ mc_pages_store_t mc_pages_store_new()
 }
 
 }
+
+#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 */

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index 8e986cf..5c2f3d2 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -2,18 +2,13 @@ cmake_minimum_required(VERSION 2.6)
 
 if(HAVE_MC)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-  add_executable(page_store page_store.cpp)
-  target_link_libraries(page_store simgrid)
 endif()
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/page_store.tesh
   PARENT_SCOPE
   )
 set(testsuite_src
   ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/page_store.cpp
   PARENT_SCOPE
   )

diff --git a/teshsuite/mc/page_store.cpp b/teshsuite/mc/page_store.cpp
deleted file mode 100644 (file)
index 592b9ba..0000000
--- a/teshsuite/mc/page_store.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <sys/mman.h>
-
-#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);
-}
-
-int main(int argc, char** argv)
-{
-  // Init
-  size_t pagesize = (size_t) getpagesize();
-  mc_pages_store_t store = new s_mc_pages_store(500);
-  void* data = getpage();
-
-  // Init:
-  xbt_assert(store->size()==0, "Bad size");
-
-  // Store the page once:
-  new_content(data, pagesize);
-  size_t pageno1 = store->store_page(data);
-  xbt_assert(store->get_ref(pageno1)==1, "Bad refcount");
-  const void* copy = store->get_page(pageno1);
-  xbt_assert(memcmp(data, copy, pagesize)==0, "Page data should be the same");
-  xbt_assert(store->size()==1, "Bad size");
-
-  // Store the same page again:
-  size_t pageno2 = store->store_page(data);
-  xbt_assert(pageno1==pageno2, "Page should be the same");
-  xbt_assert(store->get_ref(pageno1)==2, "Bad refcount");
-  xbt_assert(store->size()==1, "Bad size");
-
-  // Store a new page:
-  new_content(data, pagesize);
-  size_t pageno3 = store->store_page(data);
-  xbt_assert(pageno1 != pageno3, "New page should be different");
-  xbt_assert(store->size()==2, "Bad size");
-
-  // 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_assert(store->size()==1, "Bad size");
-
-  // Reallocate page:
-  new_content(data, pagesize);
-  size_t pageno4 = store->store_page(data);
-  xbt_assert(pageno1 == pageno4, "Page was not reused");
-  xbt_assert(store->get_ref(pageno4)==1, "Bad refcount");
-  xbt_assert(store->size()==2, "Bad size");
-
-  return 0;
-}