close gforge bug 18137 (allow different stack sizes): that was possible since years...

[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 4b30fc9..f78365f 100644 (file)
--- a/src/mc/sosp/Snapshot_test.cpp
+++ b/src/mc/sosp/Snapshot_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2020. 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. */
@@ -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 member variables init.
-std::default_random_engine snap_test_helper::rnd_engine;
 std::unique_ptr<simgrid::mc::RemoteClient> 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);
   }
 }
 
@@ -93,9 +91,8 @@ snap_test_helper::prologue_return snap_test_helper::prologue(int n)
 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));
 
@@ -109,13 +106,12 @@ void snap_test_helper::read_whole_region()
 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));
     }
@@ -129,7 +125,6 @@ void snap_test_helper::read_region_parts()
 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");
@@ -145,12 +140,11 @@ void snap_test_helper::compare_whole_region()
 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,
@@ -165,10 +159,9 @@ void snap_test_helper::compare_region_parts()
 
 void snap_test_helper::read_pointer()
 {
-
   prologue_return ret = prologue(1);
   memcpy(ret.src, &mc_model_checker, sizeof(void*));
-  simgrid::mc::Region* region2 = new simgrid::mc::Region(simgrid::mc::RegionType::Data, ret.src, ret.size);
+  const simgrid::mc::Region* region2 = new simgrid::mc::Region(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);
 
@@ -183,7 +176,6 @@ void snap_test_helper::read_pointer()
 
 TEST_CASE("MC::Snapshot: A copy/snapshot of a given memory region", "MC::Snapshot")
 {
-
   INFO("Sparse snapshot (using pages)");
 
   snap_test_helper::Init();