Use C++11 <random> instead of rand().

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

diff --git a/src/mc/sosp/mc_snapshot.cpp b/src/mc/sosp/mc_snapshot.cpp
index 0d89294..34d2ee4 100644 (file)
--- a/src/mc/sosp/mc_snapshot.cpp
+++ b/src/mc/sosp/mc_snapshot.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2019. 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. */
@@ -23,8 +23,7 @@
  *
  *  @param addr     Pointer
  *  @param snapshot Snapshot
- *  @param Snapshot region in the snapshot this pointer belongs to
- *         (or nullptr if it does not belong to any snapshot region)
+ *  @param process_index rank requesting the region
  * */
 mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot, int process_index)
 {
@@ -102,11 +101,11 @@ const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, cons
 /** Compare memory between snapshots (with known regions)
  *
  * @param addr1 Address in the first snapshot
- * @param snapshot2 Region of the address in the first snapshot
+ * @param region1 Region of the address in the first snapshot
  * @param addr2 Address in the second snapshot
- * @param snapshot2 Region of the address in the second snapshot
- * @return same as memcmp
- * */
+ * @param region2 Region of the address in the second snapshot
+ * @return same semantic as memcmp
+ */
 int MC_snapshot_region_memcmp(const void* addr1, mc_mem_region_t region1, const void* addr2, mc_mem_region_t region2,
                               size_t size)
 {
@@ -164,114 +163,3 @@ const void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr<void>
 
 } // namespace mc
 } // namespace simgrid
-
-#ifdef SIMGRID_TEST
-
-#include <cstdlib>
-#include <cstring>
-
-#include <sys/mman.h>
-
-#include "src/mc/mc_config.hpp"
-#include "src/mc/mc_mmu.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_snapshot.hpp"
-
-XBT_TEST_SUITE("mc_snapshot", "Snapshots");
-
-static inline void init_memory(void* mem, size_t size)
-{
-  char* dest = (char*)mem;
-  for (size_t i = 0; i < size; ++i) {
-    dest[i] = rand() & 255;
-  }
-}
-
-static void test_snapshot(bool sparse_checkpoint);
-
-XBT_TEST_UNIT("flat_snapshot", test_flat_snapshots, "Test flat snapshots")
-{
-  test_snapshot(0);
-}
-
-XBT_TEST_UNIT("page_snapshots", test_per_snpashots, "Test per-page snapshots")
-{
-  test_snapshot(1);
-}
-
-static void test_snapshot(bool sparse_checkpoint)
-{
-
-  xbt_test_add("Initialization");
-  _sg_mc_sparse_checkpoint = sparse_checkpoint;
-  xbt_assert(xbt_pagesize == getpagesize());
-  xbt_assert(1 << xbt_pagebits == xbt_pagesize);
-
-  std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(getpid(), -1));
-  process->init();
-  mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process));
-
-  for (int n = 1; n != 256; ++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);
-    xbt_assert(source != MAP_FAILED, "Could not allocate source memory");
-
-    // Init memory and take snapshots:
-    init_memory(source, byte_size);
-    simgrid::mc::RegionSnapshot region0 =
-        simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
-    for (int i = 0; i < n; i += 2) {
-      init_memory((char*)source + i * xbt_pagesize, xbt_pagesize);
-    }
-    simgrid::mc::RegionSnapshot region =
-        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);
-    xbt_assert(source != MAP_FAILED, "Could not allocate destination memory");
-
-    xbt_test_add("Reading whole region data for %i page(s)", n);
-    const void* read = MC_region_read(&region, destination, source, byte_size);
-    xbt_test_assert(not memcmp(source, read, byte_size), "Mismatch in MC_region_read()");
-
-    xbt_test_add("Reading parts of region data for %i page(s)", n);
-    for (int j = 0; j != 100; ++j) {
-      size_t offset    = rand() % byte_size;
-      size_t size      = rand() % (byte_size - offset);
-      const void* read = MC_region_read(&region, destination, (const char*)source + offset, size);
-      xbt_test_assert(not memcmp((char*)source + offset, read, size), "Mismatch in MC_region_read()");
-    }
-
-    xbt_test_add("Compare whole region data for %i page(s)", n);
-
-    xbt_test_assert(MC_snapshot_region_memcmp(source, &region0, source, &region, byte_size),
-                    "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
-
-    xbt_test_add("Compare parts of region data for %i page(s) with itself", n);
-    for (int j = 0; j != 100; ++j) {
-      size_t offset = rand() % byte_size;
-      size_t size   = rand() % (byte_size - offset);
-      xbt_test_assert(
-          not MC_snapshot_region_memcmp((char*)source + offset, &region, (char*)source + offset, &region, size),
-          "Mismatch in MC_snapshot_region_memcmp()");
-    }
-
-    if (n == 1) {
-      xbt_test_add("Read pointer for %i page(s)", n);
-      memcpy(source, &mc_model_checker, sizeof(void*));
-      simgrid::mc::RegionSnapshot region2 =
-          simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
-      xbt_test_assert(MC_region_read_pointer(&region2, source) == mc_model_checker,
-                      "Mismtach in MC_region_read_pointer()");
-    }
-
-    munmap(destination, byte_size);
-    munmap(source, byte_size);
-  }
-
-  delete mc_model_checker;
-  mc_model_checker = nullptr;
-}
-
-#endif /* SIMGRID_TEST */