A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark deprecated functions.
[simgrid.git]
/
src
/
mc
/
mc_page_snapshot.cpp
diff --git
a/src/mc/mc_page_snapshot.cpp
b/src/mc/mc_page_snapshot.cpp
index
4463448
..
a7f21c2
100644
(file)
--- a/
src/mc/mc_page_snapshot.cpp
+++ b/
src/mc/mc_page_snapshot.cpp
@@
-1,25
+1,24
@@
-/* MC interface: definitions that non-MC modules must see, but not the user */
-
-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
* 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. */
+/* MC interface: definitions that non-MC modules must see, but not the user */
+
+
#include <unistd.h> // pread, pwrite
#include <unistd.h> // pread, pwrite
-#include "PageStore.hpp"
-#include "
mc_mmu.h
"
-#include "
mc_private.h
"
-#include "
mc_snapshot.h
"
+#include "
src/mc/
PageStore.hpp"
+#include "
src/mc/mc_mmu.hpp
"
+#include "
src/mc/mc_private.hpp
"
+#include "
src/mc/mc_snapshot.hpp
"
#include <xbt/mmalloc.h>
#include "src/mc/ChunkedData.hpp"
using simgrid::mc::remote;
#include <xbt/mmalloc.h>
#include "src/mc/ChunkedData.hpp"
using simgrid::mc::remote;
-extern "C" {
-
/** @brief Restore a snapshot of a region
*
* If possible, the restoration will be incremental
/** @brief Restore a snapshot of a region
*
* If possible, the restoration will be incremental
@@
-29,12
+28,12
@@
extern "C" {
* @param page_count Number of pages of the region
* @param pagenos
*/
* @param page_count Number of pages of the region
* @param pagenos
*/
-void mc_restore_page_snapshot_region(simgrid::mc::
Process* process
,
-
void* start_addr,
simgrid::mc::ChunkedData const& pages_copy)
+void mc_restore_page_snapshot_region(simgrid::mc::
RemoteClient* 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:
{
for (size_t i = 0; i != pages_copy.page_count(); ++i) {
// Otherwise, copy the page:
- void* target_page =
mc_page_from_number(start_addr, i
);
+ void* target_page =
(void*) simgrid::mc::mmu::join(i, (std::uintptr_t) start_addr
);
const void* source_page = pages_copy.page(i);
process->write_bytes(source_page, xbt_pagesize, remote(target_page));
}
const void* source_page = pages_copy.page(i);
process->write_bytes(source_page, xbt_pagesize, remote(target_page));
}
@@
-42,13
+41,11
@@
void mc_restore_page_snapshot_region(simgrid::mc::Process* process,
// ***** High level API
// ***** High level API
-void mc_region_restore_sparse(simgrid::mc::
Process
* process, mc_mem_region_t reg)
+void mc_region_restore_sparse(simgrid::mc::
RemoteClient
* process, mc_mem_region_t reg)
{
xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
{
xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
- xbt_assert(
mc_page_c
ount(reg->size()) == reg->page_data().page_count());
+ xbt_assert(
simgrid::mc::mmu::chunkC
ount(reg->size()) == reg->page_data().page_count());
mc_restore_page_snapshot_region(process,
(void*) reg->permanent_address().address(), reg->page_data());
}
mc_restore_page_snapshot_region(process,
(void*) reg->permanent_address().address(), reg->page_data());
}
-
-}