// ***** Snapshot region
-static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, simgrid::mc::RegionSnapshot* region)
+static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgrid::mc::RegionSnapshot* region)
{
auto split = simgrid::mc::mmu::split(addr - region->start().address());
auto pageno = split.first;
return (char*)snapshot_page + offset;
}
-static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgrid::mc::RegionSnapshot* region,
- int process_index)
-{
- switch (region->storage_type()) {
- case simgrid::mc::StorageType::Flat: {
- uintptr_t offset = (uintptr_t)addr - (uintptr_t)region->start().address();
- return (void*)((uintptr_t)region->flat_data().get() + offset);
- }
- case simgrid::mc::StorageType::Chunked:
- return mc_translate_address_region_chunked(addr, region);
- default: // includes StorageType::NoData
- xbt_die("Storage type not supported");
- }
-}
-
// ***** MC Snapshot
/** Ignored data
std::vector<s_local_variable_t> local_variables;
simgrid::mc::UnwindContext context;
std::vector<s_mc_stack_frame_t> stack_frames;
- int process_index;
};
typedef s_mc_snapshot_stack_t* mc_snapshot_stack_t;
/* Initialization */
/* Regular use */
- const void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address, int process_index = ProcessIndexAny,
+ const void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
ReadOptions options = ReadOptions::none()) const override;
- RegionSnapshot* get_region(const void* addr, int process_index) const;
- RegionSnapshot* get_region(const void* addr, int process_index, RegionSnapshot* hinted_region) const;
+ RegionSnapshot* get_region(const void* addr) const;
+ RegionSnapshot* get_region(const void* addr, RegionSnapshot* hinted_region) const;
void restore(RemoteClient* process);
// To be private
std::size_t heap_bytes_used_;
std::vector<std::unique_ptr<RegionSnapshot>> snapshot_regions_;
std::set<pid_t> enabled_processes_;
- int privatization_index_ = 0;
std::vector<std::size_t> stack_sizes_;
std::vector<s_mc_snapshot_stack_t> stacks_;
std::vector<simgrid::mc::IgnoredHeapRegion> to_ignore_;
{
xbt_assert(region);
- std::uintptr_t offset = (std::uintptr_t)addr - (std::uintptr_t)region->start().address();
-
xbt_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary.");
- switch (region->storage_type()) {
- case simgrid::mc::StorageType::Flat:
- return (char*)region->flat_data().get() + offset;
-
- case simgrid::mc::StorageType::Chunked: {
// Last byte of the region:
void* end = (char*)addr + size - 1;
if (simgrid::mc::mmu::same_chunk((std::uintptr_t)addr, (std::uintptr_t)end)) {
// The memory is contained in a single page:
- return mc_translate_address_region_chunked((uintptr_t)addr, region);
+ return mc_translate_address_region((uintptr_t)addr, region);
}
// Otherwise, the memory spans several pages:
return MC_region_read_fragmented(region, target, addr, size);
- }
-
- default:
- // includes StorageType::NoData and StorageType::Privatized (we currently do not pass the process_index to this
- // function so we assume that the privatized region has been resolved in the callers)
- xbt_die("Storage type not supported");
- }
}
static XBT_ALWAYS_INLINE void* MC_region_read_pointer(simgrid::mc::RegionSnapshot* region, const void* addr)