X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a..a49a03122b2def71ff741e78d15b38cd1d171184:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index c217c97590..1b1c7c19e6 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -6,33 +6,21 @@ #ifndef SIMGRID_MC_SNAPSHOT_H #define SIMGRID_MC_SNAPSHOT_H -#include -#include - #include #include #include #include -#include // off_t - -#include -#include "src/xbt/mmalloc/mmprivate.h" -#include -#include - -#include "src/mc/mc_forward.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/PageStore.hpp" -#include "src/mc/AddressSpace.hpp" -#include "src/mc/mc_unw.h" #include "src/mc/RegionSnapshot.hpp" +#include "src/mc/mc_forward.hpp" +#include "src/mc/mc_unw.h" SG_BEGIN_DECL() // ***** Snapshot region -XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_region_t reg); +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) { @@ -46,34 +34,28 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t add 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::NoData: - default: - xbt_die("Storage type not supported"); - 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); + 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); } + case simgrid::mc::StorageType::NoData: + default: + 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); - +XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot, + int process_index); } // ***** MC Snapshot @@ -86,18 +68,16 @@ XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region( typedef struct s_mc_snapshot_ignored_data { void* start; std::vector data; -} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t; +} s_mc_snapshot_ignored_data_t; typedef struct s_fd_infos{ std::string filename; int number; off_t current_position; int flags; -}s_fd_infos_t, *fd_infos_t; +} s_fd_infos_t; -/** Information about a given stack frame - * - */ +/** Information about a given stack frame */ typedef struct s_mc_stack_frame { /** Instruction pointer */ unw_word_t ip; @@ -107,7 +87,8 @@ typedef struct s_mc_stack_frame { simgrid::mc::Frame* frame; std::string frame_name; unw_cursor_t unw_cursor; -} s_mc_stack_frame_t, *mc_stack_frame_t; +} s_mc_stack_frame_t; +typedef s_mc_stack_frame_t* mc_stack_frame_t; typedef struct s_local_variable{ simgrid::mc::Frame* subprogram; @@ -116,7 +97,8 @@ typedef struct s_local_variable{ simgrid::mc::Type* type; void *address; int region; -} s_local_variable_t, *local_variable_t; +} s_local_variable_t; +typedef s_local_variable_t* local_variable_t; typedef struct XBT_PRIVATE s_mc_snapshot_stack { std::vector local_variables; @@ -130,12 +112,13 @@ namespace mc { class XBT_PRIVATE Snapshot final : public AddressSpace { public: - Snapshot(Process* process, int num_state); - ~Snapshot(); + Snapshot(RemoteClient* process, int num_state); + ~Snapshot() = default; const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, ReadOptions options = ReadOptions::none()) const override; -public: // To be private + + // To be private int num_state; std::size_t heap_bytes_used; std::vector> snapshot_regions; @@ -182,9 +165,8 @@ XBT_PRIVATE void restore_snapshot(std::shared_ptr snapsho extern "C" { -XBT_PRIVATE void mc_restore_page_snapshot_region( - simgrid::mc::Process* process, - void* start_addr, simgrid::mc::ChunkedData const& pagenos); +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); @@ -216,11 +198,9 @@ static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void { xbt_assert(region); - std::uintptr_t offset = - (std::uintptr_t) addr - (std::uintptr_t) region->start().address(); + 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."); + xbt_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary."); switch (region->storage_type()) { case simgrid::mc::StorageType::NoData: