X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..9943e496eb5e20347eac1a7a2533931327355389:/src/mc/mc_snapshot.hpp diff --git a/src/mc/mc_snapshot.hpp b/src/mc/mc_snapshot.hpp index 3a86a2042c..d8d3b0ccfb 100644 --- a/src/mc/mc_snapshot.hpp +++ b/src/mc/mc_snapshot.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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,17 +6,17 @@ #ifndef SIMGRID_MC_SNAPSHOT_HPP #define SIMGRID_MC_SNAPSHOT_HPP -#include +#include #include #include -#include +#include #include "src/mc/ModelChecker.hpp" #include "src/mc/RegionSnapshot.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_unw.hpp" -SG_BEGIN_DECL() +extern "C" { // ***** Snapshot region @@ -24,32 +24,29 @@ XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::RemoteClient* process, mc static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region) { - auto split = simgrid::mc::mmu::split(addr - region->start().address()); - auto pageno = split.first; - auto offset = split.second; + auto split = simgrid::mc::mmu::split(addr - region->start().address()); + auto pageno = split.first; + auto offset = split.second; const void* snapshot_page = region->page_data().page(pageno); - return (char*) snapshot_page + offset; + 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::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); + 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); } - case simgrid::mc::StorageType::NoData: - default: + default: // includes StorageType::NoData xbt_die("Storage type not supported"); } } @@ -65,20 +62,20 @@ XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgr * Some parts of the snapshot are ignored by zeroing them out: the real * values is stored here. * */ -typedef struct s_mc_snapshot_ignored_data { +struct s_mc_snapshot_ignored_data_t { void* start; std::vector data; -} s_mc_snapshot_ignored_data_t; +}; -typedef struct s_fd_infos{ +struct s_fd_infos_t { std::string filename; int number; off_t current_position; int flags; -} s_fd_infos_t; +}; /** Information about a given stack frame */ -typedef struct s_mc_stack_frame { +struct s_mc_stack_frame_t { /** Instruction pointer */ unw_word_t ip; /** Stack pointer */ @@ -87,25 +84,26 @@ typedef struct s_mc_stack_frame { simgrid::mc::Frame* frame; std::string frame_name; unw_cursor_t unw_cursor; -} s_mc_stack_frame_t; +}; typedef s_mc_stack_frame_t* mc_stack_frame_t; -typedef struct s_local_variable{ +struct s_local_variable_t { simgrid::mc::Frame* subprogram; unsigned long ip; std::string name; simgrid::mc::Type* type; - void *address; + void* address; int region; -} s_local_variable_t; +}; typedef s_local_variable_t* local_variable_t; -typedef struct XBT_PRIVATE s_mc_snapshot_stack { - std::vector local_variables; +struct XBT_PRIVATE s_mc_snapshot_stack_t { + std::vector local_variables; simgrid::mc::UnwindContext context; std::vector stack_frames; int process_index; -} s_mc_snapshot_stack_t, *mc_snapshot_stack_t; +}; +typedef s_mc_snapshot_stack_t* mc_snapshot_stack_t; namespace simgrid { namespace mc { @@ -114,9 +112,8 @@ class XBT_PRIVATE Snapshot final : public AddressSpace { public: 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; + const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, + ReadOptions options = ReadOptions::none()) const override; // To be private int num_state; @@ -128,10 +125,9 @@ public: std::vector stacks; std::vector to_ignore; std::uint64_t hash; - std::vector ignored_data; + std::vector ignored_data; std::vector current_fds; }; - } } @@ -147,41 +143,30 @@ static XBT_ALWAYS_INLINE mc_mem_region_t mc_get_region_hinted(void* addr, simgri } static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot); - } -#ifdef __cplusplus - namespace simgrid { namespace mc { XBT_PRIVATE std::shared_ptr take_snapshot(int num_state); XBT_PRIVATE void restore_snapshot(std::shared_ptr snapshot); - } } -#endif - extern "C" { 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(mc_mem_region_t 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); -XBT_PRIVATE int MC_snapshot_memcmp( - const void* addr1, simgrid::mc::Snapshot* snapshot1, - const void* addr2, simgrid::mc::Snapshot* snapshot2, int process_index, 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); static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot) { - if(snapshot==nullptr) - xbt_die("snapshot is nullptr"); + if (snapshot == nullptr) + xbt_die("snapshot is nullptr"); return mc_model_checker->process().get_heap()->breakval; } @@ -203,39 +188,32 @@ static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void 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: - default: - xbt_die("Storage type not supported"); + case simgrid::mc::StorageType::Flat: + return (char*)region->flat_data().get() + offset; - case simgrid::mc::StorageType::Flat: - return (char*) region->flat_data().get() + offset; - - case simgrid::mc::StorageType::Chunked: - { + 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) ) { + void* end = (char*)addr + size - 1; + if (simgrid::mc::mmu::sameChunk((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); - } else { - // The memory spans several pages: - return MC_region_read_fragmented(region, target, addr, size); + return mc_translate_address_region_chunked((uintptr_t)addr, region); } + // Otherwise, the memory spans several pages: + return MC_region_read_fragmented(region, target, addr, size); } - // We currently do not pass the process_index to this function so we assume - // that the privatized region has been resolved in the callers: - case simgrid::mc::StorageType::Privatized: - xbt_die("Storage type not supported"); + 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) { void* res; - return *(void**) MC_region_read(region, &res, addr, sizeof(void*)); + return *(void**)MC_region_read(region, &res, addr, sizeof(void*)); +} } - -SG_END_DECL() #endif