/* 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. */
-#define BOOST_TEST_MODULE PAGESTORE
-#define BOOST_TEST_DYN_LINK
-
-bool init_unit_test(); // boost sometimes forget to give this prototype (NetBSD and other), which does not fit our paranoid flags
-#include <boost/test/unit_test.hpp>
+#include "src/include/catch.hpp"
#include <cstdint>
#include <cstring>
#include "src/mc/sosp/PageStore.hpp"
+#define BOOST_CHECK_MESSAGE(a, b) \
+ INFO(b); \
+ REQUIRE(a);
+
using simgrid::mc::PageStore;
/***********************************/
// a class to hold the variable used in the test cases
-class BOOST_tests {
+class helper_tests {
public:
static std::size_t pagesize;
static std::unique_ptr<PageStore> store;
static void reallocate_page();
static void new_content(void* data, std::size_t size);
- static void* getpage();
};
// static member datat initialization
-std::size_t BOOST_tests::pagesize = 0;
-std::unique_ptr<PageStore> BOOST_tests::store = nullptr;
-void* BOOST_tests::data = nullptr;
-size_t BOOST_tests::pageno[4] = {0, 0, 0, 0};
-int BOOST_tests::value = 0;
+std::size_t helper_tests::pagesize = 0;
+std::unique_ptr<PageStore> helper_tests::store = nullptr;
+void* helper_tests::data = nullptr;
+size_t helper_tests::pageno[4] = {0, 0, 0, 0};
+int helper_tests::value = 0;
-void BOOST_tests::Init()
+void helper_tests::Init()
{
pagesize = (size_t)getpagesize();
- store = std::unique_ptr<PageStore>(new simgrid::mc::PageStore(500));
- data = getpage();
+ store = std::unique_ptr<PageStore>(new simgrid::mc::PageStore(50));
+ data = mmap(nullptr, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
BOOST_CHECK_MESSAGE(store->size() == 0, "Bad size");
}
-void BOOST_tests::store_page_once()
+void helper_tests::store_page_once()
{
new_content(data, pagesize);
pageno[0] = store->store_page(data);
- BOOST_CHECK_MESSAGE(store->get_ref(pageno[0]) == 1, "Bad refcount");
+ REQUIRE(store->get_ref(pageno[0]) == 1);
const void* copy = store->get_page(pageno[0]);
BOOST_CHECK_MESSAGE(::memcmp(data, copy, pagesize) == 0, "Page data should be the same");
- BOOST_CHECK_MESSAGE(store->size() == 1, "Bad size");
+ REQUIRE(store->size() == 1);
}
-void BOOST_tests::store_same_page()
+void helper_tests::store_same_page()
{
pageno[1] = store->store_page(data);
BOOST_CHECK_MESSAGE(pageno[0] == pageno[1], "Page should be the same");
- BOOST_CHECK_MESSAGE(store->get_ref(pageno[0]) == 2, "Bad refcount");
- BOOST_CHECK_MESSAGE(store->size() == 1, "Bad size");
+ REQUIRE(store->get_ref(pageno[0]) == 2);
+ REQUIRE(store->size() == 1);
}
-void BOOST_tests::store_new_page()
+void helper_tests::store_new_page()
{
new_content(data, pagesize);
pageno[2] = store->store_page(data);
BOOST_CHECK_MESSAGE(pageno[0] != pageno[2], "New page should be different");
- BOOST_CHECK_MESSAGE(store->size() == 2, "Bad size");
+ REQUIRE(store->size() == 2);
}
-void BOOST_tests::unref_pages()
+void helper_tests::unref_pages()
{
store->unref_page(pageno[0]);
BOOST_CHECK_MESSAGE(store->get_ref(pageno[0]) == 1, "Bad refcount");
- BOOST_CHECK_MESSAGE(store->size() == 2, "Bad size");
+ REQUIRE(store->size() == 2);
store->unref_page(pageno[1]);
- BOOST_CHECK_MESSAGE(store->size() == 1, "Bad size");
+ REQUIRE(store->size() == 1);
}
-void BOOST_tests::reallocate_page()
+void helper_tests::reallocate_page()
{
new_content(data, pagesize);
pageno[3] = store->store_page(data);
BOOST_CHECK_MESSAGE(pageno[0] == pageno[3], "Page was not reused");
- BOOST_CHECK_MESSAGE(store->get_ref(pageno[3]) == 1, "Bad refcount");
- BOOST_CHECK_MESSAGE(store->size() == 2, "Bad size");
+ REQUIRE(store->get_ref(pageno[3]) == 1);
+ REQUIRE(store->size() == 2);
}
-void BOOST_tests::new_content(void* data, std::size_t size)
+void helper_tests::new_content(void* data, std::size_t size)
{
value++;
::memset(data, value, size);
}
-void* BOOST_tests::getpage()
-{
- return mmap(nullptr, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-}
-
-namespace utf = boost::unit_test; // for test case dependence
-
-BOOST_AUTO_TEST_SUITE(PAGESTORE)
-BOOST_AUTO_TEST_CASE(Init)
-{
- BOOST_tests::Init();
-}
-
-BOOST_AUTO_TEST_CASE(store_page_once, *utf::depends_on("PAGESTORE/Init"))
+TEST_CASE("MC page store, used during checkpoint", "MC::PageStore")
{
- BOOST_tests::store_page_once();
-}
+ helper_tests::Init();
+ INFO("Store page once");
+ helper_tests::store_page_once();
-BOOST_AUTO_TEST_CASE(store_same_page, *utf::depends_on("PAGESTORE/store_page_once"))
-{
- BOOST_tests::store_same_page();
-}
+ INFO("Store the same page");
+ helper_tests::store_same_page();
-BOOST_AUTO_TEST_CASE(store_new_page, *utf::depends_on("PAGESTORE/store_same_page"))
-{
- BOOST_tests::store_new_page();
-}
+ INFO("Store a new page");
+ helper_tests::store_new_page();
-BOOST_AUTO_TEST_CASE(unref_pages, *utf::depends_on("PAGESTORE/store_new_page"))
-{
- BOOST_tests::unref_pages();
-}
+ INFO("Unref pages");
+ helper_tests::unref_pages();
-BOOST_AUTO_TEST_CASE(reallocate_page, *utf::depends_on("PAGESTORE/unref_pages"))
-{
- BOOST_tests::reallocate_page();
+ INFO("Reallocate pages");
+ helper_tests::reallocate_page();
}
-BOOST_AUTO_TEST_SUITE_END()
/* 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. */
-#define BOOST_TEST_MODULE snapshots
-#define BOOST_TEST_DYN_LINK
-bool init_unit_test(); // boost sometimes forget to give this prototype (NetBSD and other), which does not fit our paranoid flags
-#include <boost/test/unit_test.hpp>
+#include "src/include/catch.hpp"
#include <cstdlib>
#include <cstring>
/**************** Class BOOST_tests *************************/
using simgrid::mc::RegionSnapshot;
-class BOOST_tests {
+class snap_test_helper {
public:
static void init_memory(void* mem, size_t size);
static void Init(bool sparse_ckpt);
};
// static member variables init.
-bool BOOST_tests::sparse_checkpoint = 0;
-std::unique_ptr<simgrid::mc::RemoteClient> BOOST_tests::process = nullptr;
+bool snap_test_helper::sparse_checkpoint = 0;
+std::unique_ptr<simgrid::mc::RemoteClient> snap_test_helper::process = nullptr;
-void BOOST_tests::init_memory(void* mem, size_t size)
+void snap_test_helper::init_memory(void* mem, size_t size)
{
char* dest = (char*)mem;
for (size_t i = 0; i < size; ++i) {
}
}
-void BOOST_tests::Init(bool sparse_ckpt)
+void snap_test_helper::Init(bool sparse_ckpt)
{
_sg_mc_sparse_checkpoint = sparse_ckpt;
- BOOST_CHECK_EQUAL(xbt_pagesize, getpagesize());
- BOOST_CHECK_EQUAL(1 << xbt_pagebits, xbt_pagesize);
+ REQUIRE(xbt_pagesize == getpagesize());
+ REQUIRE(1 << xbt_pagebits == xbt_pagesize);
process = std::unique_ptr<simgrid::mc::RemoteClient>(new simgrid::mc::RemoteClient(getpid(), -1));
process->init();
mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process));
}
-BOOST_tests::prologue_return BOOST_tests::prologue(int n)
+snap_test_helper::prologue_return snap_test_helper::prologue(int n)
{
// Store region page(s):
size_t byte_size = n * xbt_pagesize;
void* source = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- BOOST_CHECK_MESSAGE(source != MAP_FAILED, "Could not allocate source memory");
+ INFO("Could not allocate source memory")
+ REQUIRE(source != MAP_FAILED);
// Init memory and take snapshots:
init_memory(source, byte_size);
simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
void* destination = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- BOOST_CHECK_MESSAGE(source != MAP_FAILED, "Could not allocate destination memory");
+ INFO("Could not allocate destination memory");
+ REQUIRE(source != MAP_FAILED);
return {.size = byte_size,
.src = source,
.region = std::move(region)};
}
-void BOOST_tests::read_whole_region()
+void snap_test_helper::read_whole_region()
{
for (int n = 1; n != 256; ++n) {
prologue_return ret = prologue(n);
const void* read = MC_region_read(&(ret.region), ret.dstn, ret.src, ret.size);
- BOOST_CHECK_MESSAGE(not memcmp(ret.src, read, ret.size), "Mismatch in MC_region_read()");
+ INFO("Mismatch in MC_region_read()");
+ REQUIRE(not memcmp(ret.src, read, ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
}
}
-void BOOST_tests::read_region_parts()
+void snap_test_helper::read_region_parts()
{
for (int n = 1; n != 256; ++n) {
size_t offset = rand() % ret.size;
size_t size = rand() % (ret.size - offset);
const void* read = MC_region_read(&(ret.region), ret.dstn, (const char*)ret.src + offset, size);
- BOOST_CHECK_MESSAGE(not memcmp((char*)ret.src + offset, read, size), "Mismatch in MC_region_read()");
+ INFO("Mismatch in MC_region_read()");
+ REQUIRE(not memcmp((char*)ret.src + offset, read, size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
}
}
-void BOOST_tests::compare_whole_region()
+void snap_test_helper::compare_whole_region()
{
for (int n = 1; n != 256; ++n) {
prologue_return ret = prologue(n);
- BOOST_CHECK_MESSAGE(MC_snapshot_region_memcmp(ret.src, &(ret.region0), ret.src, &(ret.region), ret.size),
- "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
+ INFO("Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
+ REQUIRE(MC_snapshot_region_memcmp(ret.src, &(ret.region0), ret.src, &(ret.region), ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
}
}
-void BOOST_tests::compare_region_parts()
+void snap_test_helper::compare_region_parts()
{
for (int n = 1; n != 256; ++n) {
for (int j = 0; j != 100; ++j) {
size_t offset = rand() % ret.size;
size_t size = rand() % (ret.size - offset);
- BOOST_CHECK_MESSAGE(not MC_snapshot_region_memcmp((char*)ret.src + offset, &(ret.region), (char*)ret.src + offset,
- &(ret.region), size),
- "Mismatch in MC_snapshot_region_memcmp()");
+
+ INFO("Mismatch in MC_snapshot_region_memcmp()");
+ REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, &(ret.region), (char*)ret.src + offset,
+ &(ret.region), size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
}
}
-void BOOST_tests::read_pointer()
+void snap_test_helper::read_pointer()
{
prologue_return ret = prologue(1);
memcpy(ret.src, &mc_model_checker, sizeof(void*));
simgrid::mc::RegionSnapshot region2 =
simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, ret.src, ret.src, ret.size);
- BOOST_CHECK_MESSAGE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker,
- "Mismtach in MC_region_read_pointer()");
+ INFO("Mismtach in MC_region_read_pointer()");
+ REQUIRE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker);
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
}
/*************** End: class BOOST_tests *****************************/
-
-namespace utf = boost::unit_test; // for test case dependence
-
-BOOST_AUTO_TEST_SUITE(flat_snapshot)
-BOOST_AUTO_TEST_CASE(Init)
+TEST_CASE("MC::Snapshot: A copy/snapshot of a given memory region", "MC::Snapshot")
{
- BOOST_tests::Init(0);
-}
-BOOST_AUTO_TEST_CASE(read_whole_region, *utf::depends_on("flat_snapshot/Init"))
-{
- BOOST_tests::read_whole_region();
-}
+ SECTION("Flat snapshot (no pages)")
+ {
+ snap_test_helper::Init(0);
-BOOST_AUTO_TEST_CASE(read_region_parts, *utf::depends_on("flat_snapshot/read_whole_region"))
-{
- BOOST_tests::read_region_parts();
-}
+ INFO("Read whole region");
+ snap_test_helper::read_whole_region();
-BOOST_AUTO_TEST_CASE(compare_whole_region, *utf::depends_on("flat_snapshot/read_region_parts"))
-{
- BOOST_tests::compare_whole_region();
-}
+ INFO("Read region parts");
+ snap_test_helper::read_region_parts();
-BOOST_AUTO_TEST_CASE(compare_region_parts, *utf::depends_on("flat_snapshot/compare_whole_region"))
-{
- BOOST_tests::compare_region_parts();
-}
+ INFO("Compare whole region");
+ snap_test_helper::compare_whole_region();
-BOOST_AUTO_TEST_CASE(read_pointer, *utf::depends_on("flat_snapshot/compare_region_parts"))
-{
- BOOST_tests::read_pointer();
-}
+ INFO("Compare region parts");
+ snap_test_helper::compare_region_parts();
-// not really a test, just for cleanup the resources
-BOOST_AUTO_TEST_CASE(cleanup, *utf::depends_on("flat_snapshot/read_pointer"))
-{
- BOOST_tests::cleanup();
-}
-BOOST_AUTO_TEST_SUITE_END()
+ INFO("Read pointer");
+ snap_test_helper::read_pointer();
-BOOST_AUTO_TEST_SUITE(page_snapshots)
-BOOST_AUTO_TEST_CASE(Init)
-{
- BOOST_tests::Init(1);
-}
+ snap_test_helper::cleanup();
+ }
-BOOST_AUTO_TEST_CASE(read_whole_region, *utf::depends_on("page_snapshots/Init"))
-{
- BOOST_tests::read_whole_region();
-}
+ SECTION("Sparse snapshot (using pages)")
+ {
+ snap_test_helper::Init(1);
-BOOST_AUTO_TEST_CASE(read_region_parts, *utf::depends_on("page_snapshots/read_whole_region"))
-{
- BOOST_tests::read_region_parts();
-}
+ INFO("Read whole region");
+ snap_test_helper::read_whole_region();
-BOOST_AUTO_TEST_CASE(compare_whole_region, *utf::depends_on("page_snapshots/read_region_parts"))
-{
- BOOST_tests::compare_whole_region();
-}
+ INFO("Read region parts");
+ snap_test_helper::read_region_parts();
-BOOST_AUTO_TEST_CASE(compare_region_parts, *utf::depends_on("page_snapshots/compare_whole_region"))
-{
- BOOST_tests::compare_region_parts();
-}
+ INFO("Compare whole region");
+ snap_test_helper::compare_whole_region();
-BOOST_AUTO_TEST_CASE(read_pointer, *utf::depends_on("page_snapshots/compare_region_parts"))
-{
- BOOST_tests::read_pointer();
-}
+ INFO("Compare region parts");
+ snap_test_helper::compare_region_parts();
-// not really a test, just for cleanup the resources
-BOOST_AUTO_TEST_CASE(cleanup, *utf::depends_on("page_snapshots/read_pointer"))
-{
- BOOST_tests::cleanup();
+ INFO("Read pointer");
+ snap_test_helper::read_pointer();
+
+ snap_test_helper::cleanup();
+ }
}
-BOOST_AUTO_TEST_SUITE_END()
