/* MC interface: definitions that non-MC modules must see, but not the user */
-/* Copyright (c) 2014-2015. The SimGrid Team. All rights reserved. */
+/* 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 "mc_snapshot.h"
#include <xbt/mmalloc.h>
+#include <mc/ChunkedData.hpp>
using simgrid::mc::remote;
-namespace simgrid {
-namespace mc {
-
-/** @brief Take a per-page snapshot of a region
- *
- * @param data The start of the region (must be at the beginning of a page)
- * @param pag_count Number of pages of the region
- * @return Snapshot page numbers of this new snapshot
- */
-PerPageCopy::PerPageCopy(PageStore& store, AddressSpace& as,
- remote_ptr<void> addr, std::size_t page_count)
-{
- store_ = &store;
- this->pagenos_.resize(page_count);
- std::vector<char> buffer(xbt_pagesize);
-
- for (size_t i = 0; i != page_count; ++i) {
-
- remote_ptr<void> page = remote(addr.address() + (i << xbt_pagebits));
- xbt_assert(mc_page_offset((void*)page.address())==0,
- "Not at the beginning of a page");
-
- /* Adding another copy (and a syscall) will probably slow things a lot.
- TODO, optimize this somehow (at least by grouping the syscalls)
- if needed. Either:
- - reduce the number of syscalls;
- - let the application snapshot itself;
- - move the segments in shared memory (this will break `fork` however).
- */
-
- as.read_bytes(
- buffer.data(), xbt_pagesize, page,
- simgrid::mc::ProcessIndexDisabled);
-
- pagenos_[i] = store_->store_page(buffer.data());
-
- }
-}
-
-}
-}
-
extern "C" {
/** @brief Restore a snapshot of a region
* @param page_count Number of pages of the region
* @param pagenos
*/
-void mc_restore_page_snapshot_region(mc_process_t process,
- void* start_addr, simgrid::mc::PerPageCopy const& pages_copy)
+void mc_restore_page_snapshot_region(simgrid::mc::Process* process,
+ void* start_addr, simgrid::mc::ChunkedData const& pages_copy)
{
for (size_t i = 0; i != pages_copy.page_count(); ++i) {
// Otherwise, copy the page:
// ***** High level API
-mc_mem_region_t mc_region_new_sparse(mc_region_type_t region_type,
- void *start_addr, void* permanent_addr, size_t size)
-{
- mc_process_t process = &mc_model_checker->process();
-
- xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize-1)) == 0,
- "Not at the beginning of a page");
- xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
- "Not at the beginning of a page");
- size_t page_count = mc_page_count(size);
-
- simgrid::mc::PerPageCopy page_data =
- simgrid::mc::PerPageCopy(mc_model_checker->page_store(), *process,
- permanent_addr, page_count);
-
- mc_mem_region_t region = new simgrid::mc::RegionSnapshot(
- region_type, start_addr, permanent_addr, size);
- region->page_data(std::move(page_data));
-
- return region;
-}
-
-void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg)
+void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_region_t reg)
{
- xbt_assert((((uintptr_t)reg->permanent_addr) & (xbt_pagesize-1)) == 0,
+ xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
- xbt_assert(mc_page_count(reg->size) == reg->page_data().page_count());
+ xbt_assert(mc_page_count(reg->size()) == reg->page_data().page_count());
mc_restore_page_snapshot_region(process,
- reg->permanent_addr, reg->page_data());
+ (void*) reg->permanent_address().address(), reg->page_data());
}
}
