X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2435e5aed6141ff0d9e97bc341ff0225c29adca..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/mc/sosp/Snapshot_test.cpp diff --git a/src/mc/sosp/Snapshot_test.cpp b/src/mc/sosp/Snapshot_test.cpp index 4b30fc94ce..942e88fa79 100644 --- 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. */ @@ -93,9 +93,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 +108,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); + 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,7 +143,6 @@ 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) { @@ -165,10 +162,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 +179,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();