X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..b5bfcc5ac199bc0d2ed00a832d08fec1462b9e83:/src/mc/sosp/mc_snapshot.hpp diff --git a/src/mc/sosp/mc_snapshot.hpp b/src/mc/sosp/mc_snapshot.hpp index 61e1ed1978..9e63033749 100644 --- a/src/mc/sosp/mc_snapshot.hpp +++ b/src/mc/sosp/mc_snapshot.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -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_chunked(uintptr_t addr, simgrid::mc::RegionSnapshot* region) { auto split = simgrid::mc::mmu::split(addr - region->start().address()); auto pageno = split.first; @@ -24,7 +22,8 @@ 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) +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: { @@ -44,9 +43,6 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_me } } -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 @@ -59,13 +55,6 @@ struct s_mc_snapshot_ignored_data_t { std::vector data; }; -struct s_fd_infos_t { - std::string filename; - int number; - off_t current_position; - int flags; -}; - /** Information about a given stack frame */ struct s_mc_stack_frame_t { /** Instruction pointer */ @@ -85,7 +74,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; @@ -104,51 +92,47 @@ class XBT_PRIVATE Snapshot final : public AddressSpace { public: Snapshot(RemoteClient* process, int num_state); ~Snapshot() = default; + + /* Initialization */ + void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, void* permanent_addr, + std::size_t size); + + /* Regular use */ const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, 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; // 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; - std::vector current_fds; + 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_ = 0; + std::vector ignored_data_; }; } // 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); +XBT_PRIVATE void restore_snapshot(std::shared_ptr snapshot); } // 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) { @@ -165,7 +149,7 @@ 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); @@ -181,7 +165,7 @@ static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void 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); } @@ -196,7 +180,7 @@ static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void } } -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*));