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
[mc] Add remote_ptr for marking pointers-to/addresses-in the remote process
[simgrid.git]
/
src
/
mc
/
mc_snapshot.cpp
diff --git
a/src/mc/mc_snapshot.cpp
b/src/mc/mc_snapshot.cpp
index
857d47d
..
57e229d
100644
(file)
--- a/
src/mc/mc_snapshot.cpp
+++ b/
src/mc/mc_snapshot.cpp
@@
-183,12
+183,12
@@
Snapshot::~Snapshot()
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
-
std::uint64_t
address, int process_index,
+
remote_ptr<void>
address, int process_index,
AddressSpace::ReadMode mode)
{
AddressSpace::ReadMode mode)
{
- mc_mem_region_t region = mc_get_snapshot_region((void*)address, this, process_index);
+ mc_mem_region_t region = mc_get_snapshot_region((void*)address
.address()
, this, process_index);
if (region) {
if (region) {
- const void* res = MC_region_read(region, buffer, (void*)address, size);
+ const void* res = MC_region_read(region, buffer, (void*)address
.address()
, size);
if (buffer == res || mode == AddressSpace::Lazy)
return res;
else {
if (buffer == res || mode == AddressSpace::Lazy)
return res;
else {
@@
-197,7
+197,7
@@
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
}
}
else
}
}
else
- return MC_process_read(this->process, mode, buffer, (void*)address, size, process_index);
+ return MC_process_read(this->process, mode, buffer, (void*)address
.address()
, size, process_index);
}
}
}
}