X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c65a2fd02f74c12e469150dfbae04366f4be484c..d2b42c9c0b31834a48bc489d05e4f9499b81bb72:/src/mc/sosp/mc_snapshot.hpp?ds=sidebyside diff --git a/src/mc/sosp/mc_snapshot.hpp b/src/mc/sosp/mc_snapshot.hpp index 692990cc6b..5ecafac6f7 100644 --- a/src/mc/sosp/mc_snapshot.hpp +++ b/src/mc/sosp/mc_snapshot.hpp @@ -7,15 +7,13 @@ #define SIMGRID_MC_SNAPSHOT_HPP #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_unw.hpp" +#include "src/mc/inspect/mc_unw.hpp" #include "src/mc/remote/RemoteClient.hpp" #include "src/mc/sosp/RegionSnapshot.hpp" // ***** Snapshot region -XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, mc_mem_region_t reg); - -static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t 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; @@ -24,29 +22,6 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t add return (char*)snapshot_page + offset; } -static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t 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); - case simgrid::mc::StorageType::Privatized: { - xbt_assert(process_index >= 0, "Missing process index for privatized region"); - xbt_assert((size_t)process_index < region->privatized_data().size(), "Out of range process index"); - simgrid::mc::RegionSnapshot& subregion = region->privatized_data()[process_index]; - return mc_translate_address_region(addr, &subregion, process_index); - } - default: // includes StorageType::NoData - xbt_die("Storage type not supported"); - } -} - -XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot, - int process_index); - // ***** MC Snapshot /** Ignored data @@ -78,7 +53,6 @@ struct s_local_variable_t { std::string name; simgrid::mc::Type* type; void* address; - int region; }; typedef s_local_variable_t* local_variable_t; @@ -86,7 +60,6 @@ struct XBT_PRIVATE s_mc_snapshot_stack_t { std::vector local_variables; simgrid::mc::UnwindContext context; std::vector stack_frames; - int process_index; }; typedef s_mc_snapshot_stack_t* mc_snapshot_stack_t; @@ -95,52 +68,52 @@ namespace mc { class XBT_PRIVATE Snapshot final : public AddressSpace { public: - Snapshot(RemoteClient* process, int num_state); + Snapshot(int num_state, RemoteClient* process = &mc_model_checker->process()); ~Snapshot() = default; - const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, + + /* Initialization */ + + /* Regular use */ + const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, ReadOptions options = ReadOptions::none()) const override; + RegionSnapshot* get_region(const void* addr) const; + RegionSnapshot* get_region(const void* addr, RegionSnapshot* hinted_region) const; + void restore(RemoteClient* process); // To be private - int num_state; - std::size_t heap_bytes_used; - std::vector> snapshot_regions; - std::set enabled_processes; - int privatization_index; - std::vector stack_sizes; - std::vector stacks; - std::vector to_ignore; - std::uint64_t hash; - std::vector ignored_data; + int num_state_; + std::size_t heap_bytes_used_; + std::vector> snapshot_regions_; + std::set enabled_processes_; + std::vector stack_sizes_; + std::vector stacks_; + std::vector to_ignore_; + std::uint64_t hash_ = 0; + std::vector ignored_data_; + +private: + void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, void* permanent_addr, + std::size_t size); + void snapshot_regions(simgrid::mc::RemoteClient* process); + void snapshot_stacks(simgrid::mc::RemoteClient* process); }; } // namespace mc } // namespace simgrid -static XBT_ALWAYS_INLINE mc_mem_region_t mc_get_region_hinted(void* addr, simgrid::mc::Snapshot* snapshot, - int process_index, mc_mem_region_t region) -{ - if (region->contain(simgrid::mc::remote(addr))) - return region; - else - return mc_get_snapshot_region(addr, snapshot, process_index); -} - static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot); namespace simgrid { namespace mc { -XBT_PRIVATE std::shared_ptr take_snapshot(int num_state); -XBT_PRIVATE void restore_snapshot(std::shared_ptr snapshot); +XBT_PRIVATE std::shared_ptr take_snapshot(int num_state); } // namespace mc } // namespace simgrid -XBT_PRIVATE void mc_restore_page_snapshot_region(simgrid::mc::RemoteClient* process, void* start_addr, - simgrid::mc::ChunkedData const& pagenos); - -const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, const void* addr, std::size_t size); +const void* MC_region_read_fragmented(simgrid::mc::RegionSnapshot* region, void* target, const void* addr, + std::size_t size); -int MC_snapshot_region_memcmp(const void* addr1, mc_mem_region_t region1, const void* addr2, mc_mem_region_t region2, - std::size_t size); +int MC_snapshot_region_memcmp(const void* addr1, simgrid::mc::RegionSnapshot* region1, const void* addr2, + simgrid::mc::RegionSnapshot* region2, std::size_t size); static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot) { @@ -157,38 +130,24 @@ static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snaps * @param size Size of the data to read in bytes * @return Pointer where the data is located (target buffer of original location) */ -static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, +static XBT_ALWAYS_INLINE const void* MC_region_read(simgrid::mc::RegionSnapshot* region, void* target, const void* addr, std::size_t size) { 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::sameChunk((std::uintptr_t)addr, (std::uintptr_t)end)) { + 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(mc_mem_region_t region, const void* addr) +static XBT_ALWAYS_INLINE void* MC_region_read_pointer(simgrid::mc::RegionSnapshot* region, const void* addr) { void* res; return *(void**)MC_region_read(region, &res, addr, sizeof(void*));