X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f89671e0bd7450461d70d5ced6079123e73c2a63..196b543c8e909828b40e851eaf4443ee28f76c70:/src/mc/sosp/Snapshot.cpp diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp index 2f50339173..6b07c1f544 100644 --- a/src/mc/sosp/Snapshot.cpp +++ b/src/mc/sosp/Snapshot.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2022. 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. */ @@ -6,29 +6,26 @@ #include "src/mc/sosp/Snapshot.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_hash.hpp" -#include "src/mc/mc_smx.hpp" #include /* std::size_t */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_snapshot, mc, "Taking and restoring snapshots"); -namespace simgrid { -namespace mc { +namespace simgrid::mc { /************************************* Take Snapshot ************************************/ /****************************************************************************************/ -void simgrid::mc::Snapshot::snapshot_regions(simgrid::mc::RemoteClient* process) +void Snapshot::snapshot_regions(RemoteProcess* process) { snapshot_regions_.clear(); for (auto const& object_info : process->object_infos) - add_region(simgrid::mc::RegionType::Data, object_info.get(), object_info->start_rw, - object_info->end_rw - object_info->start_rw); + add_region(RegionType::Data, object_info.get(), object_info->start_rw, object_info->end_rw - object_info->start_rw); - xbt_mheap_t heap = process->get_heap(); + const s_xbt_mheap_t* heap = process->get_heap(); void* start_heap = heap->base; void* end_heap = heap->breakval; - add_region(simgrid::mc::RegionType::Heap, nullptr, start_heap, (char*)end_heap - (char*)start_heap); + 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()); } @@ -41,7 +38,7 @@ void simgrid::mc::Snapshot::snapshot_regions(simgrid::mc::RemoteClient* process) * @param ip Instruction pointer * @return true if the variable is valid * */ -static bool valid_variable(simgrid::mc::Variable* var, simgrid::mc::Frame* scope, const void* ip) +static bool valid_variable(const simgrid::mc::Variable* var, simgrid::mc::Frame* scope, const void* ip) { // The variable is not yet valid: if (scope->range.begin() + var->start_scope > (std::uint64_t)ip) @@ -50,17 +47,22 @@ static bool valid_variable(simgrid::mc::Variable* var, simgrid::mc::Frame* scope return true; } -static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::mc::Frame* scope, +static void fill_local_variables_values(mc_stack_frame_t stack_frame, Frame* scope, std::vector& result) { if (not scope || not scope->range.contain(stack_frame->ip)) return; - for (simgrid::mc::Variable& current_variable : scope->variables) { - + for (const Variable& current_variable : scope->variables) { if (not valid_variable(¤t_variable, scope, (void*)stack_frame->ip)) continue; + if (not current_variable.type) { + XBT_VERB("Ignore local variable without type: '%s' [%s]", current_variable.name.c_str(), + stack_frame->frame->name.c_str()); + continue; + } + s_local_variable_t new_var; new_var.subprogram = stack_frame->frame; new_var.ip = stack_frame->ip; @@ -71,14 +73,12 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::m if (current_variable.address != nullptr) new_var.address = current_variable.address; else if (not current_variable.location_list.empty()) { - simgrid::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->process()); + 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()); - if (not location.in_memory()) - xbt_die("Cannot handle non-address variable"); + xbt_assert(location.in_memory(), "Cannot handle non-address variable"); new_var.address = location.address(); - } else xbt_die("No address"); @@ -86,7 +86,7 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::m } // Recursive processing of nested scopes: - for (simgrid::mc::Frame& nested_scope : scope->scopes) + for (Frame& nested_scope : scope->scopes) fill_local_variables_values(stack_frame, &nested_scope, result); } @@ -98,17 +98,16 @@ static std::vector get_local_variables_values(std::vector unwind_stack_frames(simgrid::mc::UnwindContext* stack_context) +static std::vector unwind_stack_frames(UnwindContext* stack_context) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + const RemoteProcess* process = &mc_model_checker->get_remote_process(); std::vector result; unw_cursor_t c = stack_context->cursor(); // TODO, check condition check (unw_init_local==0 means end of frame) - while (1) { - + while (true) { s_mc_stack_frame_t stack_frame; stack_frame.unw_cursor = c; @@ -124,7 +123,7 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo // TODO, use real addresses in frame_t instead of fixing it here - simgrid::mc::Frame* frame = process->find_function(remote(ip)); + Frame* frame = process->find_function(remote(ip)); stack_frame.frame = frame; if (frame) { @@ -142,10 +141,8 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo break; int ret = unw_step(&c); - if (ret == 0) - xbt_die("Unexpected end of stack."); - else if (ret < 0) - xbt_die("Error while unwinding stack"); + xbt_assert(ret >= 0, "Error while unwinding stack"); + xbt_assert(ret != 0, "Unexpected end of stack."); } xbt_assert(not result.empty(), "unw_init_local failed"); @@ -153,7 +150,7 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo return result; } -void simgrid::mc::Snapshot::snapshot_stacks(simgrid::mc::RemoteClient* process) +void Snapshot::snapshot_stacks(RemoteProcess* process) { for (auto const& stack : process->stack_areas()) { s_mc_snapshot_stack_t st; @@ -176,34 +173,35 @@ void simgrid::mc::Snapshot::snapshot_stacks(simgrid::mc::RemoteClient* process) } } -static void snapshot_handle_ignore(simgrid::mc::Snapshot* snapshot) +static void snapshot_handle_ignore(Snapshot* snapshot) { - xbt_assert(snapshot->process()); + xbt_assert(snapshot->get_remote_process()); // Copy the memory: - for (auto const& region : snapshot->process()->ignored_regions()) { + for (auto const& region : snapshot->get_remote_process()->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: - snapshot->process()->read_bytes(ignored_data.data.data(), region.size, remote(region.addr)); + snapshot->get_remote_process()->read_bytes(ignored_data.data.data(), region.size, remote(region.addr)); snapshot->ignored_data_.push_back(std::move(ignored_data)); } // Zero the memory: - for (auto const& region : snapshot->process()->ignored_regions()) - snapshot->process()->clear_bytes(remote(region.addr), region.size); + for (auto const& region : snapshot->get_remote_process()->ignored_regions()) + snapshot->get_remote_process()->clear_bytes(remote(region.addr), region.size); } -static void snapshot_ignore_restore(simgrid::mc::Snapshot* snapshot) + +static void snapshot_ignore_restore(const simgrid::mc::Snapshot* snapshot) { for (auto const& ignored_data : snapshot->ignored_data_) - snapshot->process()->write_bytes(ignored_data.data.data(), ignored_data.data.size(), remote(ignored_data.start)); + snapshot->get_remote_process()->write_bytes(ignored_data.data.data(), ignored_data.data.size(), + remote(ignored_data.start)); } -Snapshot::Snapshot(int num_state, RemoteClient* process) - : AddressSpace(process), num_state_(num_state), heap_bytes_used_(0), enabled_processes_(), hash_(0) +Snapshot::Snapshot(long num_state, RemoteProcess* process) : AddressSpace(process), num_state_(num_state) { - XBT_DEBUG("Taking snapshot %i", num_state); + XBT_DEBUG("Taking snapshot %ld", num_state); for (auto const& p : process->actors()) enabled_processes_.insert(p.copy.get_buffer()->get_pid()); @@ -225,19 +223,19 @@ Snapshot::Snapshot(int num_state, RemoteClient* process) void Snapshot::add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size) { - if (type == simgrid::mc::RegionType::Data) + if (type == RegionType::Data) xbt_assert(object_info, "Missing object info for object."); - else if (type == simgrid::mc::RegionType::Heap) + else if (type == RegionType::Heap) xbt_assert(not object_info, "Unexpected object info for heap region."); - simgrid::mc::Region* region = new Region(type, start_addr, size); + auto* region = new Region(type, start_addr, size); region->object_info(object_info); - snapshot_regions_.push_back(std::unique_ptr(std::move(region))); + snapshot_regions_.push_back(std::unique_ptr(region)); } void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr address, ReadOptions options) const { - Region* region = this->get_region((void*)address.address()); + const Region* region = this->get_region((void*)address.address()); if (region) { void* res = region->read(buffer, (void*)address.address(), size); if (buffer == res || options & ReadOptions::lazy()) @@ -247,7 +245,7 @@ void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr addre return buffer; } } else - return this->process()->read_bytes(buffer, size, address, options); + return this->get_remote_process()->read_bytes(buffer, size, address, options); } /** @brief Find the snapshotted region from a pointer * @@ -276,12 +274,12 @@ Region* Snapshot::get_region(const void* addr, Region* hinted_region) const return get_region(addr); } -void Snapshot::restore(RemoteClient* process) +void Snapshot::restore(RemoteProcess* process) const { - XBT_DEBUG("Restore snapshot %i", num_state_); + XBT_DEBUG("Restore snapshot %ld", num_state_); // Restore regions - for (std::unique_ptr const& region : snapshot_regions_) { + for (std::unique_ptr const& region : snapshot_regions_) { if (region) // privatized variables are not snapshotted region.get()->restore(); } @@ -290,5 +288,4 @@ void Snapshot::restore(RemoteClient* process) process->clear_cache(); } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc