-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2021. 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. */
#include "src/mc/sosp/Snapshot.hpp"
#include <cstddef>
-#include <random>
+#include <memory>
#include <sys/mman.h>
+#include <xbt/random.hpp>
/**************** Class BOOST_tests *************************/
-using simgrid::mc::RegionSnapshot;
+using simgrid::mc::Region;
class snap_test_helper {
public:
static void init_memory(void* mem, size_t size);
static void Init();
- typedef struct {
+ struct prologue_return {
size_t size;
void* src;
void* dstn;
- RegionSnapshot* region0;
- RegionSnapshot* region;
- } prologue_return;
+ Region* region0;
+ Region* region;
+ };
static prologue_return prologue(int n); // common to the below 5 fxs
static void read_whole_region();
static void read_region_parts();
mc_model_checker = nullptr;
}
- static std::default_random_engine rnd_engine;
- static std::unique_ptr<simgrid::mc::RemoteClient> process;
+ static std::unique_ptr<simgrid::mc::RemoteSimulation> process;
};
// static member variables init.
-std::default_random_engine snap_test_helper::rnd_engine;
-std::unique_ptr<simgrid::mc::RemoteClient> snap_test_helper::process = nullptr;
+std::unique_ptr<simgrid::mc::RemoteSimulation> snap_test_helper::process = nullptr;
void snap_test_helper::init_memory(void* mem, size_t size)
{
- char* dest = (char*)mem;
+ auto* dest = static_cast<char*>(mem);
for (size_t i = 0; i < size; ++i) {
- dest[i] = rnd_engine() & 255;
+ dest[i] = simgrid::xbt::random::uniform_int(0, 0xff);
}
}
REQUIRE(xbt_pagesize == getpagesize());
REQUIRE(1 << xbt_pagebits == xbt_pagesize);
- process.reset(new simgrid::mc::RemoteClient(getpid(), -1));
+ process = std::make_unique<simgrid::mc::RemoteSimulation>(getpid());
process->init();
- mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process));
+ mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process), -1);
}
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);
- INFO("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::RegionSnapshot* region0 =
- new simgrid::mc::RegionSnapshot(simgrid::mc::RegionType::Unknown, source, byte_size);
+ auto* region0 = new simgrid::mc::Region(simgrid::mc::RegionType::Data, source, byte_size);
for (int i = 0; i < n; i += 2) {
init_memory((char*)source + i * xbt_pagesize, xbt_pagesize);
}
- simgrid::mc::RegionSnapshot* region =
- new simgrid::mc::RegionSnapshot(simgrid::mc::RegionType::Unknown, source, byte_size);
+ auto* region = new simgrid::mc::Region(simgrid::mc::RegionType::Data, source, byte_size);
void* destination = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
INFO("Could not allocate destination memory");
- REQUIRE(source != MAP_FAILED);
+ REQUIRE(destination != MAP_FAILED);
- return {.size = byte_size,
- .src = source,
- .dstn = destination,
- .region0 = std::move(region0),
- .region = std::move(region)};
+ return {.size = byte_size, .src = source, .dstn = destination, .region0 = region0, .region = region};
}
void snap_test_helper::read_whole_region()
{
for (int n = 1; n != 32; ++n) {
-
prologue_return ret = prologue(n);
- const void* read = MC_region_read(ret.region, ret.dstn, ret.src, ret.size);
+ const void* read = ret.region->read(ret.dstn, ret.src, ret.size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp(ret.src, read, ret.size));
void snap_test_helper::read_region_parts()
{
for (int n = 1; n != 32; ++n) {
-
prologue_return ret = prologue(n);
for (int j = 0; j != 100; ++j) {
- size_t offset = rnd_engine() % ret.size;
- size_t size = rnd_engine() % (ret.size - offset);
- const void* read = MC_region_read(ret.region, ret.dstn, (const char*)ret.src + offset, size);
+ size_t offset = simgrid::xbt::random::uniform_int(0, ret.size - 1);
+ size_t size = simgrid::xbt::random::uniform_int(0, ret.size - offset - 1);
+ const void* read = ret.region->read(ret.dstn, (const char*)ret.src + offset, size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp((char*)ret.src + offset, read, size));
}
void snap_test_helper::compare_whole_region()
{
for (int n = 1; n != 32; ++n) {
-
prologue_return ret = prologue(n);
INFO("Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
void snap_test_helper::compare_region_parts()
{
for (int n = 1; n != 32; ++n) {
-
prologue_return ret = prologue(n);
for (int j = 0; j != 100; ++j) {
- size_t offset = rnd_engine() % ret.size;
- size_t size = rnd_engine() % (ret.size - offset);
+ size_t offset = simgrid::xbt::random::uniform_int(0, ret.size - 1);
+ size_t size = simgrid::xbt::random::uniform_int(0, ret.size - offset - 1);
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,
void snap_test_helper::read_pointer()
{
-
prologue_return ret = prologue(1);
memcpy(ret.src, &mc_model_checker, sizeof(void*));
- simgrid::mc::RegionSnapshot* region2 =
- new simgrid::mc::RegionSnapshot(simgrid::mc::RegionType::Unknown, ret.src, ret.size);
+ const simgrid::mc::Region region2(simgrid::mc::RegionType::Data, ret.src, ret.size);
INFO("Mismtach in MC_region_read_pointer()");
- REQUIRE(MC_region_read_pointer(region2, ret.src) == mc_model_checker);
+ REQUIRE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker);
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
delete ret.region0;
delete ret.region;
- delete region2;
}
/*************** End: class snap_test_helper *****************************/
TEST_CASE("MC::Snapshot: A copy/snapshot of a given memory region", "MC::Snapshot")
{
-
INFO("Sparse snapshot (using pages)");
snap_test_helper::Init();
