Use standard macro to check C++ version.

[simgrid.git] / src / mc / sosp / Snapshot_test.cpp

diff --git a/src/mc/sosp/Snapshot_test.cpp b/src/mc/sosp/Snapshot_test.cpp
index 36a7298b5b5fc4ed6fef41047d74444a80dcd40b..c961a37c273c6be3ee860cf0a892dd0d87094f41 100644 (file)
--- a/src/mc/sosp/Snapshot_test.cpp
+++ b/src/mc/sosp/Snapshot_test.cpp
@@ -8,8 +8,8 @@
 #include "src/mc/sosp/Snapshot.hpp"
 
 #include <cstddef>
-#include <random>
 #include <sys/mman.h>
+#include <xbt/random.hpp>
 
 /**************** Class BOOST_tests *************************/
 using simgrid::mc::Region;
@@ -37,19 +37,17 @@ public:
     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;
   for (size_t i = 0; i < size; ++i) {
-    dest[i] = rnd_engine() & 255;
+    dest[i] = simgrid::xbt::random::uniform_int(0, 0xff);
   }
 }
 
@@ -58,9 +56,9 @@ void snap_test_helper::Init()
   REQUIRE(xbt_pagesize == getpagesize());
   REQUIRE(1 << xbt_pagebits == xbt_pagesize);
 
-  process.reset(new simgrid::mc::RemoteClient(getpid(), -1));
+  process.reset(new 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)
@@ -111,8 +109,8 @@ void snap_test_helper::read_region_parts()
     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);
       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));
@@ -145,8 +143,8 @@ void snap_test_helper::compare_region_parts()
     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,