-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. 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/private.h"
+
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/PageStore.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, mc_snapshot_t snapshot, int process_index)
+mc_mem_region_t mc_get_snapshot_region(
+ 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 (!(region && region->contain(simgrid::mc::remote(addr))))
continue;
- if (region->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+ if (region->storage_type() == simgrid::mc::StorageType::Privatized) {
#ifdef HAVE_SMPI
// Use the current process index of the snapshot:
- if (process_index == MC_PROCESS_INDEX_DISABLED) {
+ if (process_index == simgrid::mc::ProcessIndexDisabled) {
process_index = snapshot->privatization_index;
}
if (process_index < 0) {
xbt_die("Missing process index");
}
- if (process_index >= (int) region->privatized.regions_count) {
+ if (process_index >= (int) region->privatized_data().size()) {
xbt_die("Invalid process index");
}
- mc_mem_region_t priv_region = region->privatized.regions[process_index];
- xbt_assert(mc_region_contain(priv_region, addr));
- return priv_region;
+ simgrid::mc::RegionSnapshot& priv_region = region->privatized_data()[process_index];
+ 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)");
#endif
return region;
}
- return NULL;
+ return nullptr;
}
/** @brief Read memory from a snapshot region broken across fragmented pages
void* end = (char*) addr + size - 1;
// Page of the last byte of the memory area:
- size_t page_end = mc_page_number(NULL, end);
+ size_t page_end = mc_page_number(nullptr, end);
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) {
- void* snapshot_addr = mc_translate_address_region((uintptr_t) addr, region);
- void* next_page = mc_page_from_number(NULL, mc_page_number(NULL, addr) + 1);
+ while (mc_page_number(nullptr, addr) != page_end) {
+ void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t) addr, region);
+ void* next_page = mc_page_from_number(nullptr, mc_page_number(NULL, addr) + 1);
size_t readable = (char*) next_page - (char*) addr;
memcpy(dest, snapshot_addr, readable);
addr = (char*) addr + readable;
}
// Read the end:
- void* snapshot_addr = mc_translate_address_region((uintptr_t)addr, region);
+ void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t)addr, region);
memcpy(dest, snapshot_addr, size);
return target;
}
-/** @brief Read memory from a snapshot
- *
- * @param addr Process (non-snapshot) address of the data
- * @param snapshot Snapshot (or NULL is no snapshot)
- * @param target Buffer to store the value
- * @param size Size of the data to read in bytes
- * @return Pointer where the data is located (target buffer or original location)
- */
-const void* MC_snapshot_read(
- mc_snapshot_t snapshot, adress_space_read_flags_t flags,
- void* target, const void* addr, size_t size, int process_index)
-{
- mc_mem_region_t region = mc_get_snapshot_region(addr, snapshot, process_index);
- if (region)
- return MC_region_read(region, target, addr, size);
- else
- return MC_process_read(snapshot->process, flags, target, addr, size, process_index);
-}
-
/** Compare memory between snapshots (with known regions)
*
* @param addr1 Address in the first snapshot
// 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==MC_REGION_STORAGE_TYPE_FLAT;
- const bool region2_need_buffer = region2==NULL || region2->storage_type==MC_REGION_STORAGE_TYPE_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) : malloc(size);
+ void* buffer2a = region2_need_buffer ? nullptr : stack_alloc ? alloca(size) : malloc(size);
const void* buffer1 = MC_region_read(region1, buffer1a, addr1, size);
const void* buffer2 = MC_region_read(region2, buffer2a, addr2, size);
int res;
return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size);
}
+namespace simgrid {
+namespace mc {
+
+Snapshot::Snapshot(Process* process) :
+ AddressSpace(process),
+ num_state(0),
+ heap_bytes_used(0),
+ enabled_processes(),
+ privatization_index(0),
+ hash(0)
+{
+
+}
+
+Snapshot::~Snapshot()
+{
+
+}
+
+const void* Snapshot::read_bytes(void* buffer, std::size_t size,
+ 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 || options & ReadOptions::lazy())
+ return res;
+ else {
+ memcpy(buffer, res, size);
+ return buffer;
+ }
+ }
+ else
+ return this->process()->read_bytes(
+ buffer, size, address, process_index, options);
+}
+
+}
+}
+
+}
+
#ifdef SIMGRID_TEST
#include <string.h>
#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_private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_mmu.h"
XBT_TEST_SUITE("mc_snapshot", "Snapshots");
_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::Process> process(new simgrid::mc::Process(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:
init_memory(source, byte_size);
- mc_mem_region_t region0 = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+ simgrid::mc::RegionSnapshot region0 = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size, nullptr);
for(int i=0; i<n; i+=2) {
init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
}
- mc_mem_region_t region = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+ simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size, nullptr);
- 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(region, destination, source, byte_size);
+ 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_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);
+ 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_add("Compare whole region data for %i page(s)", n);
- xbt_test_assert(!MC_snapshot_region_memcmp(source, NULL, source, region, byte_size),
- "Mismatch in MC_snapshot_region_memcmp() for the whole region");
- 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 current value", 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, NULL, (char*) source+offset, region, size),
- "Mismatch in MC_snapshot_region_memcmp()");
- }
+ xbt_test_assert(MC_snapshot_region_memcmp(source, ®ion0, source, ®ion, 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(!MC_snapshot_region_memcmp((char*) source+offset, region, (char*) source+offset, region, size),
+ xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, ®ion, (char*) source+offset, ®ion, 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*));
- mc_mem_region_t region2 = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
- xbt_test_assert(MC_region_read_pointer(region2, source) == mc_model_checker,
+ simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size, nullptr);
+ xbt_test_assert(MC_region_read_pointer(®ion2, source) == mc_model_checker,
"Mismtach in MC_region_read_pointer()");
- MC_region_destroy(region2);
}
- MC_region_destroy(region);
- MC_region_destroy(region0);
munmap(destination, byte_size);
munmap(source, byte_size);
}
delete mc_model_checker;
- mc_model_checker = NULL;
-}
-
+ mc_model_checker = nullptr;
}
#endif /* SIMGRID_TEST */
-}
