-/* Copyright (c) 2014. 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <stdbool.h>
+#include <cstddef>
-#include "internal_config.h"
-#include "smpi/private.h"
+#include <memory>
+#include <utility>
-#include "mc_snapshot.h"
-#include "mc_private.h"
-#include "mc_mmu.h"
-#include "PageStore.hpp"
+#include "xbt/asserts.h"
+#include "xbt/sysdep.h"
+
+#include "src/internal_config.h"
+#include "src/smpi/include/private.hpp"
+
+#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" {
* @param addr Pointer
* @param snapshot Snapshot
* @param Snapshot region in the snapshot this pointer belongs to
- * (or NULL if it does not belong to any snapshot region)
+ * (or nullptr if it does not belong to any snapshot region)
* */
mc_mem_region_t mc_get_snapshot_region(
- const void* addr, const s_mc_snapshot_t* snapshot, int process_index)
+ const void* addr, const simgrid::mc::Snapshot* snapshot, int process_index)
{
- size_t n = snapshot->snapshot_regions_count;
+ size_t n = snapshot->snapshot_regions.size();
for (size_t i = 0; i != n; ++i) {
- mc_mem_region_t region = snapshot->snapshot_regions[i];
- if (!(region && mc_region_contain(region, addr)))
+ mc_mem_region_t region = snapshot->snapshot_regions[i].get();
+ if (not(region && region->contain(simgrid::mc::remote(addr))))
continue;
if (region->storage_type() == simgrid::mc::StorageType::Privatized) {
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
// Use the current process index of the snapshot:
- if (process_index == simgrid::mc::ProcessIndexDisabled) {
+ if (process_index == simgrid::mc::ProcessIndexDisabled)
process_index = snapshot->privatization_index;
- }
- if (process_index < 0) {
+ if (process_index < 0)
xbt_die("Missing process index");
- }
- if (process_index >= (int) region->privatized_data().size()) {
+ if (process_index >= (int) region->privatized_data().size())
xbt_die("Invalid process index");
- }
simgrid::mc::RegionSnapshot& priv_region = region->privatized_data()[process_index];
- xbt_assert(mc_region_contain(&priv_region, addr));
+ xbt_assert(priv_region.contain(simgrid::mc::remote(addr)));
return &priv_region;
#else
xbt_die("Privatized region in a non SMPI build (this should not happen)");
return region;
}
- return NULL;
+ return nullptr;
}
/** @brief Read memory from a snapshot region broken across fragmented pages
// Last byte of the memory area:
void* end = (char*) addr + size - 1;
+ // TODO, we assume the chunks are aligned to natural chunk boundaries.
+ // We should remove this assumption.
+
// Page of the last byte of the memory area:
- size_t page_end = mc_page_number(NULL, end);
+ size_t page_end = simgrid::mc::mmu::split((std::uintptr_t) end).first;
void* dest = target;
- if (dest==NULL) {
+ if (dest==nullptr)
xbt_die("Missing destination buffer for fragmented memory access");
- }
// Read each page:
- while (mc_page_number(NULL, addr) != page_end) {
+ while (simgrid::mc::mmu::split((std::uintptr_t) addr).first != page_end) {
void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t) addr, region);
- void* next_page = mc_page_from_number(NULL, mc_page_number(NULL, addr) + 1);
+ void* next_page = (void*) simgrid::mc::mmu::join(
+ simgrid::mc::mmu::split((std::uintptr_t) addr).first + 1,
+ 0);
size_t readable = (char*) next_page - (char*) addr;
memcpy(dest, snapshot_addr, readable);
addr = (char*) addr + readable;
// Using alloca() for large allocations may trigger stack overflow:
// use malloc if the buffer is too big.
bool stack_alloc = size < 64;
- const bool region1_need_buffer = region1==NULL || region1->storage_type()==simgrid::mc::StorageType::Flat;
- const bool region2_need_buffer = region2==NULL || region2->storage_type()==simgrid::mc::StorageType::Flat;
- void* buffer1a = region1_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
- void* buffer2a = region2_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
+ 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) : ::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;
- if (buffer1 == buffer2) {
+ if (buffer1 == buffer2)
res = 0;
- } else {
+ 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, mc_snapshot_t snapshot1,
- const void* addr2, mc_snapshot_t 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(nullptr),
- num_state(0),
- heap_bytes_used(0),
- snapshot_regions(nullptr),
- snapshot_regions_count(0),
- enabled_processes(0),
- privatization_index(0),
- stack_sizes(nullptr),
- stacks(nullptr),
- to_ignore(nullptr),
- hash(0),
- ignored_data(nullptr),
- total_fd(0),
- current_fd(nullptr)
+Snapshot::Snapshot(RemoteClient* process, int _num_state)
+ : AddressSpace(process)
+ , num_state(_num_state)
+ , heap_bytes_used(0)
+ , enabled_processes()
+ , privatization_index(0)
+ , hash(0)
{
}
-Snapshot::~Snapshot()
-{
- for (size_t i = 0; i < this->snapshot_regions_count; i++) {
- delete this->snapshot_regions[i];
- }
- xbt_free(this->snapshot_regions);
- xbt_free(this->stack_sizes);
- xbt_dynar_free(&(this->stacks));
- xbt_dynar_free(&(this->to_ignore));
- xbt_dynar_free(&this->ignored_data);
-}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
- remote_ptr<void> address, int process_index,
- AddressSpace::ReadMode mode) const
+ RemotePtr<void> address, int process_index,
+ ReadOptions options) const
{
mc_mem_region_t region = mc_get_snapshot_region((void*)address.address(), this, process_index);
if (region) {
const void* res = MC_region_read(region, buffer, (void*)address.address(), size);
- if (buffer == res || mode == AddressSpace::Lazy)
+ if (buffer == res || options & ReadOptions::lazy())
return res;
else {
memcpy(buffer, res, size);
}
}
else
- return this->read_bytes(buffer, size, address, process_index, mode);
+ return this->process()->read_bytes(
+ buffer, size, address, process_index, options);
}
}
#ifdef SIMGRID_TEST
-#include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
#include <sys/mman.h>
-#include "mc/mc_private.h"
-#include "mc/mc_snapshot.h"
-#include "mc/mc_mmu.h"
-
-extern "C" {
+#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 void test_snapshot(bool sparse_checkpoint) {
- xbt_test_add("Initialisation");
+ xbt_test_add("Initialization");
_sg_mc_sparse_checkpoint = sparse_checkpoint;
xbt_assert(xbt_pagesize == getpagesize());
xbt_assert(1 << xbt_pagebits == xbt_pagesize);
- mc_model_checker = new ::simgrid::mc::ModelChecker(getpid(), -1);
+
+ 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(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ 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:
simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
simgrid::mc::RegionType::Unknown, source, source, byte_size);
- void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ 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(®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);
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) {
}
delete mc_model_checker;
- mc_model_checker = NULL;
-}
-
+ mc_model_checker = nullptr;
}
#endif /* SIMGRID_TEST */
-}
