/* 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, const simgrid::mc::Snapshot* snapshot, int process_index)
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) {
+ 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(NULL, mc_page_number(NULL, addr) + 1);
+ 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;
// 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) : 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;
}
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 <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:
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);
}
delete mc_model_checker;
- mc_model_checker = NULL;
-}
-
+ mc_model_checker = nullptr;
}
#endif /* SIMGRID_TEST */
-}
