/************************************* Take Snapshot ************************************/
/****************************************************************************************/
-void Snapshot::snapshot_regions(RemoteProcess* process)
+void Snapshot::snapshot_regions(RemoteProcessMemory& process_memory)
{
snapshot_regions_.clear();
- for (auto const& object_info : process->object_infos)
+ for (auto const& object_info : process_memory.object_infos)
add_region(RegionType::Data, object_info.get(), object_info->start_rw, object_info->end_rw - object_info->start_rw);
- const s_xbt_mheap_t* heap = process->get_heap();
+ const s_xbt_mheap_t* heap = process_memory.get_heap();
void* start_heap = heap->base;
void* end_heap = heap->breakval;
add_region(RegionType::Heap, nullptr, start_heap, (char*)end_heap - (char*)start_heap);
- heap_bytes_used_ = mmalloc_get_bytes_used_remote(heap->heaplimit, process->get_malloc_info());
+ heap_bytes_used_ = mmalloc_get_bytes_used_remote(heap->heaplimit, process_memory.get_malloc_info());
}
/** @brief Checks whether the variable is in scope for a given IP.
else if (not current_variable.location_list.empty()) {
dwarf::Location location = simgrid::dwarf::resolve(current_variable.location_list, current_variable.object_info,
&(stack_frame->unw_cursor), (void*)stack_frame->frame_base,
- &mc_model_checker->get_remote_process());
+ &mc_model_checker->get_remote_process_memory());
xbt_assert(location.in_memory(), "Cannot handle non-address variable");
new_var.address = location.address();
static std::vector<s_mc_stack_frame_t> unwind_stack_frames(UnwindContext* stack_context)
{
- const RemoteProcess* process = &mc_model_checker->get_remote_process();
+ const RemoteProcessMemory* process_memory = &mc_model_checker->get_remote_process_memory();
std::vector<s_mc_stack_frame_t> result;
unw_cursor_t c = stack_context->cursor();
// TODO, use real addresses in frame_t instead of fixing it here
- Frame* frame = process->find_function(remote(ip));
+ Frame* frame = process_memory->find_function(remote(ip));
stack_frame.frame = frame;
if (frame) {
return result;
}
-void Snapshot::snapshot_stacks(RemoteProcess* process)
+void Snapshot::snapshot_stacks(RemoteProcessMemory& process_memory)
{
- for (auto const& stack : process->stack_areas()) {
+ for (auto const& stack : process_memory.stack_areas()) {
s_mc_snapshot_stack_t st;
- // Read the context from remote process:
+ // Read the context from remote process memory:
unw_context_t context;
- process->read_bytes(&context, sizeof(context), remote(stack.context));
+ process_memory.read_bytes(&context, sizeof(context), remote(stack.context));
- st.context.initialize(process, &context);
+ st.context.initialize(process_memory, &context);
st.stack_frames = unwind_stack_frames(&st.context);
st.local_variables = get_local_variables_values(st.stack_frames);
void Snapshot::handle_ignore()
{
- xbt_assert(get_remote_process());
+ xbt_assert(get_remote_process_memory());
// Copy the memory:
- for (auto const& region : get_remote_process()->ignored_regions()) {
+ for (auto const& region : get_remote_process_memory()->ignored_regions()) {
s_mc_snapshot_ignored_data_t ignored_data;
ignored_data.start = (void*)region.addr;
ignored_data.data.resize(region.size);
- // TODO, we should do this once per privatization segment:
- get_remote_process()->read_bytes(ignored_data.data.data(), region.size, remote(region.addr));
+ get_remote_process_memory()->read_bytes(ignored_data.data.data(), region.size, remote(region.addr));
ignored_data_.push_back(std::move(ignored_data));
}
// Zero the memory:
- for (auto const& region : get_remote_process()->ignored_regions())
- get_remote_process()->clear_bytes(remote(region.addr), region.size);
+ for (auto const& region : get_remote_process_memory()->ignored_regions())
+ get_remote_process_memory()->clear_bytes(remote(region.addr), region.size);
}
void Snapshot::ignore_restore() const
{
for (auto const& ignored_data : ignored_data_)
- get_remote_process()->write_bytes(ignored_data.data.data(), ignored_data.data.size(), remote(ignored_data.start));
+ get_remote_process_memory()->write_bytes(ignored_data.data.data(), ignored_data.data.size(),
+ remote(ignored_data.start));
}
-Snapshot::Snapshot(long num_state, PageStore& store, RemoteProcess* process)
- : AddressSpace(process), page_store_(store), num_state_(num_state)
+Snapshot::Snapshot(long num_state, PageStore& store, RemoteProcessMemory& memory)
+ : AddressSpace(memory), page_store_(store), num_state_(num_state)
{
XBT_DEBUG("Taking snapshot %ld", num_state);
handle_ignore();
/* Save the std heap and the writable mapped pages of libsimgrid and binary */
- snapshot_regions(process);
+ snapshot_regions(memory);
- to_ignore_ = process->ignored_heap();
+ to_ignore_ = memory.ignored_heap();
if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.get().empty()) {
- snapshot_stacks(process);
+ snapshot_stacks(memory);
hash_ = this->do_hash();
}
return buffer;
}
} else
- return this->get_remote_process()->read_bytes(buffer, size, address, options);
+ return this->get_remote_process_memory()->read_bytes(buffer, size, address, options);
}
/** @brief Find the snapshotted region from a pointer
*
return get_region(addr);
}
-void Snapshot::restore(RemoteProcess* process) const
+void Snapshot::restore(RemoteProcessMemory& memory) const
{
XBT_DEBUG("Restore snapshot %ld", num_state_);
// Restore regions
for (std::unique_ptr<Region> const& region : snapshot_regions_) {
- if (region) // privatized variables are not snapshotted
- region.get()->restore();
+ region->restore();
}
ignore_restore();
- process->clear_cache();
+ memory.clear_cache();
}
/* ----------- Hashing logic -------------- */
