X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17a02864e7ac2f0a531712199939b4fb4282d438..9943e496eb5e20347eac1a7a2533931327355389:/src/mc/mc_snapshot.cpp diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp index 0dff797c92..7823e430a6 100644 --- a/src/mc/mc_snapshot.cpp +++ b/src/mc/mc_snapshot.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,16 +9,16 @@ #include #include -#include -#include +#include "xbt/asserts.h" +#include "xbt/sysdep.h" #include "src/internal_config.h" -#include "src/smpi/private.h" +#include "src/smpi/include/private.hpp" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_mmu.h" #include "src/mc/PageStore.hpp" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" extern "C" { @@ -35,7 +35,7 @@ mc_mem_region_t mc_get_snapshot_region( size_t n = snapshot->snapshot_regions.size(); for (size_t i = 0; i != n; ++i) { mc_mem_region_t region = snapshot->snapshot_regions[i].get(); - if (!(region && region->contain(simgrid::mc::remote(addr)))) + if (not(region && region->contain(simgrid::mc::remote(addr)))) continue; if (region->storage_type() == simgrid::mc::StorageType::Privatized) { @@ -123,8 +123,8 @@ int MC_snapshot_region_memcmp( bool stack_alloc = size < 64; const bool region1_need_buffer = region1==nullptr || region1->storage_type()==simgrid::mc::StorageType::Flat; const bool region2_need_buffer = region2==nullptr || region2->storage_type()==simgrid::mc::StorageType::Flat; - void* buffer1a = region1_need_buffer ? nullptr : stack_alloc ? alloca(size) : malloc(size); - void* buffer2a = region2_need_buffer ? nullptr : stack_alloc ? alloca(size) : malloc(size); + void* buffer1a = region1_need_buffer ? nullptr : stack_alloc ? alloca(size) : ::operator new(size); + void* buffer2a = region2_need_buffer ? nullptr : stack_alloc ? alloca(size) : ::operator new(size); const void* buffer1 = MC_region_read(region1, buffer1a, addr1, size); const void* buffer2 = MC_region_read(region2, buffer2a, addr2, size); int res; @@ -132,34 +132,19 @@ int MC_snapshot_region_memcmp( res = 0; else res = memcmp(buffer1, buffer2, size); - if (!stack_alloc) { - free(buffer1a); - free(buffer2a); + if (not stack_alloc) { + ::operator delete(buffer1a); + ::operator delete(buffer2a); } return res; } -/** Compare memory between snapshots - * - * @param addr1 Address in the first snapshot - * @param snapshot1 First snapshot - * @param addr2 Address in the second snapshot - * @param snapshot2 Second snapshot - * @return same as memcmp - * */ -int MC_snapshot_memcmp( - const void* addr1, simgrid::mc::Snapshot* snapshot1, - const void* addr2, simgrid::mc::Snapshot* snapshot2, int process_index, size_t size) -{ - mc_mem_region_t region1 = mc_get_snapshot_region(addr1, snapshot1, process_index); - mc_mem_region_t region2 = mc_get_snapshot_region(addr2, snapshot2, process_index); - return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size); -} +} // extern "C" namespace simgrid { namespace mc { -Snapshot::Snapshot(Process* process, int _num_state) +Snapshot::Snapshot(RemoteClient* process, int _num_state) : AddressSpace(process) , num_state(_num_state) , heap_bytes_used(0) @@ -192,18 +177,16 @@ const void* Snapshot::read_bytes(void* buffer, std::size_t size, } } -} - #ifdef SIMGRID_TEST -#include -#include +#include +#include #include -#include "src/mc/mc_private.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_mmu.h" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" XBT_TEST_SUITE("mc_snapshot", "Snapshots"); @@ -234,7 +217,7 @@ static void test_snapshot(bool sparse_checkpoint) { xbt_assert(xbt_pagesize == getpagesize()); xbt_assert(1 << xbt_pagebits == xbt_pagesize); - std::unique_ptr process(new simgrid::mc::Process(getpid(), -1)); + std::unique_ptr process(new simgrid::mc::RemoteClient(getpid(), -1)); process->init(); mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process)); @@ -260,15 +243,14 @@ static void test_snapshot(bool sparse_checkpoint) { xbt_test_add("Reading whole region data for %i page(s)", n); const void* read = MC_region_read(®ion, destination, source, byte_size); - xbt_test_assert(!memcmp(source, read, byte_size), "Mismatch in MC_region_read()"); + 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(®ion, destination, (const char*) source+offset, size); - xbt_test_assert(!memcmp((char*) source+offset, read, size), - "Mismatch in MC_region_read()"); + 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); @@ -280,8 +262,9 @@ static void test_snapshot(bool sparse_checkpoint) { for(int j=0; j!=100; ++j) { size_t offset = rand() % byte_size; size_t size = rand() % (byte_size - offset); - xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, ®ion, (char*) source+offset, ®ion, size), - "Mismatch in MC_snapshot_region_memcmp()"); + xbt_test_assert( + not MC_snapshot_region_memcmp((char*)source + offset, ®ion, (char*)source + offset, ®ion, size), + "Mismatch in MC_snapshot_region_memcmp()"); } if (n==1) {