#include <sys/mman.h>
#include <xbt/random.hpp>
-/**************** Class BOOST_tests *************************/
-using simgrid::mc::Region;
class snap_test_helper {
- static simgrid::mc::PageStore page_store_;
+ simgrid::mc::PageStore page_store_{500};
+ simgrid::mc::RemoteProcessMemory memory_{getpid(), nullptr};
-public:
- static void init_memory(void* mem, size_t size);
- static void Init();
struct prologue_return {
size_t size;
- void* src;
- void* dstn;
- Region* region0;
- Region* region;
+ std::byte* src;
+ std::byte* dstn;
+ std::unique_ptr<simgrid::mc::Region> region0;
+ std::unique_ptr<simgrid::mc::Region> region;
};
- static prologue_return prologue(int n); // common to the below 5 fxs
- static void read_whole_region();
- static void read_region_parts();
- static void compare_whole_region();
- static void compare_region_parts();
- static void read_pointer();
-
- static void cleanup()
- {
- delete mc_model_checker;
- mc_model_checker = nullptr;
- }
+ prologue_return prologue(int n); // common to the below 5 fxs
- static std::unique_ptr<simgrid::mc::RemoteProcessMemory> process;
-};
+ static void init_memory(std::byte* mem, size_t size);
+
+public:
+ void read_whole_region();
+ void read_region_parts();
+ void compare_whole_region();
+ void compare_region_parts();
+ void read_pointer();
-// static member variables init.
-std::unique_ptr<simgrid::mc::RemoteProcessMemory> snap_test_helper::process = nullptr;
-simgrid::mc::PageStore snap_test_helper::page_store_(500);
+ static void basic_requirements();
+};
-void snap_test_helper::init_memory(void* mem, size_t size)
+void snap_test_helper::init_memory(std::byte* mem, size_t size)
{
- auto* dest = static_cast<char*>(mem);
- for (size_t i = 0; i < size; ++i) {
- dest[i] = simgrid::xbt::random::uniform_int(0, 0xff);
- }
+ std::generate_n(mem, size, []() { return static_cast<std::byte>(simgrid::xbt::random::uniform_int(0, 0xff)); });
}
-void snap_test_helper::Init()
+void snap_test_helper::basic_requirements()
{
REQUIRE(xbt_pagesize == getpagesize());
REQUIRE(1 << xbt_pagebits == xbt_pagesize);
-
- process = std::make_unique<simgrid::mc::RemoteProcessMemory>(getpid());
- process->init(nullptr);
- mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process));
}
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);
+ auto* source =
+ static_cast<std::byte*>(mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
INFO("Could not allocate source memory");
REQUIRE(source != MAP_FAILED);
// Init memory and take snapshots:
init_memory(source, byte_size);
- auto* region0 = new simgrid::mc::Region(page_store_, simgrid::mc::RegionType::Data, source, byte_size);
+ auto region0 =
+ std::make_unique<simgrid::mc::Region>(page_store_, memory_, simgrid::mc::RegionType::Data, source, byte_size);
for (int i = 0; i < n; i += 2) {
- init_memory((char*)source + i * xbt_pagesize, xbt_pagesize);
+ init_memory(source + i * xbt_pagesize, xbt_pagesize);
}
- auto* region = new simgrid::mc::Region(page_store_, simgrid::mc::RegionType::Data, source, byte_size);
+ auto region =
+ std::make_unique<simgrid::mc::Region>(page_store_, memory_, simgrid::mc::RegionType::Data, source, byte_size);
- void* destination = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ auto* destination =
+ static_cast<std::byte*>(mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
INFO("Could not allocate destination memory");
REQUIRE(destination != MAP_FAILED);
- return {.size = byte_size, .src = source, .dstn = destination, .region0 = region0, .region = region};
+ return {.size = byte_size,
+ .src = source,
+ .dstn = destination,
+ .region0 = std::move(region0),
+ .region = std::move(region)};
}
void snap_test_helper::read_whole_region()
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
- delete ret.region0;
- delete ret.region;
}
}
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
- delete ret.region0;
- delete ret.region;
}
}
prologue_return ret = prologue(n);
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));
+ REQUIRE(MC_snapshot_region_memcmp(ret.src, ret.region0.get(), ret.src, ret.region.get(), ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
- delete ret.region0;
- delete ret.region;
}
}
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,
- size));
+ REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, ret.region.get(), (char*)ret.src + offset,
+ ret.region.get(), size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
- delete ret.region0;
- delete ret.region;
}
}
+const int some_global_variable = 42;
+const void* const some_global_pointer = &some_global_variable;
void snap_test_helper::read_pointer()
{
prologue_return ret = prologue(1);
- memcpy(ret.src, &mc_model_checker, sizeof(void*));
- const simgrid::mc::Region region2(page_store_, simgrid::mc::RegionType::Data, ret.src, ret.size);
+ memcpy(ret.src, &some_global_pointer, sizeof(void*));
+ const simgrid::mc::Region region2(page_store_, memory_, simgrid::mc::RegionType::Data, ret.src, ret.size);
INFO("Mismtach in MC_region_read_pointer()");
- REQUIRE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker);
+ REQUIRE(MC_region_read_pointer(®ion2, ret.src) == some_global_pointer);
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
- delete ret.region0;
- delete ret.region;
}
/*************** End: class snap_test_helper *****************************/
{
INFO("Sparse snapshot (using pages)");
- snap_test_helper::Init();
+ snap_test_helper::basic_requirements();
+
+ snap_test_helper snap_test;
INFO("Read whole region");
- snap_test_helper::read_whole_region();
+ snap_test.read_whole_region();
INFO("Read region parts");
- snap_test_helper::read_region_parts();
+ snap_test.read_region_parts();
INFO("Compare whole region");
- snap_test_helper::compare_whole_region();
+ snap_test.compare_whole_region();
INFO("Compare region parts");
- snap_test_helper::compare_region_parts();
+ snap_test.compare_region_parts();
INFO("Read pointer");
- snap_test_helper::read_pointer();
-
- snap_test_helper::cleanup();
+ snap_test.read_pointer();
}
