X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02a7d032779c8f37702c9513f1c3fbb988088677..cc1eb8c4e293f75ccddc257ebc44bfcd0883073e:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 412606f15e..17c64d886f 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -10,6 +10,10 @@ #include // off_t #include // size_t +#include +#include +#include + #include #include "../xbt/mmalloc/mmprivate.h" #include @@ -21,202 +25,48 @@ #include "mc_mmalloc.h" #include "mc/AddressSpace.hpp" #include "mc_unw.h" +#include "RegionSnapshot.hpp" SG_BEGIN_DECL() // ***** Snapshot region -typedef enum e_mc_region_type_t { - MC_REGION_TYPE_UNKNOWN = 0, - MC_REGION_TYPE_HEAP = 1, - MC_REGION_TYPE_DATA = 2 -} mc_region_type_t; - -// TODO, use OO instead of this -typedef enum e_mc_region_storeage_type_t { - MC_REGION_STORAGE_TYPE_NONE = 0, - MC_REGION_STORAGE_TYPE_FLAT = 1, - MC_REGION_STORAGE_TYPE_CHUNKED = 2, - MC_REGION_STORAGE_TYPE_PRIVATIZED = 3 -} mc_region_storage_type_t; - -namespace simgrid { -namespace mc { - -class PerPageCopy { - PageStore* store_; - std::vector pagenos_; -public: - PerPageCopy() : store_(nullptr) {} - PerPageCopy(PerPageCopy const& that) - { - store_ = that.store_; - pagenos_ = that.pagenos_; - for (std::size_t pageno : pagenos_) - store_->ref_page(pageno); - } - void clear() - { - for (std::size_t pageno : pagenos_) - store_->unref_page(pageno); - pagenos_.clear(); - } - ~PerPageCopy() { - clear(); - } - - PerPageCopy(PerPageCopy&& that) - { - store_ = that.store_; - that.store_ = nullptr; - pagenos_ = std::move(that.pagenos_); - that.pagenos_.clear(); - } - PerPageCopy& operator=(PerPageCopy const& that) - { - this->clear(); - store_ = that.store_; - pagenos_ = that.pagenos_; - for (std::size_t pageno : pagenos_) - store_->ref_page(pageno); - return *this; - } - PerPageCopy& operator=(PerPageCopy && that) - { - this->clear(); - store_ = that.store_; - that.store_ = nullptr; - pagenos_ = std::move(that.pagenos_); - that.pagenos_.clear(); - return *this; - } - - std::size_t page_count() const - { - return pagenos_.size(); - } - - std::size_t pageno(std::size_t i) const - { - return pagenos_[i]; - } - - const void* page(std::size_t i) const - { - return store_->get_page(pagenos_[i]); - } - - PerPageCopy(PageStore& store, AddressSpace& as, - remote_ptr addr, std::size_t page_count); -}; - -/** @brief Copy/snapshot of a given memory region - * - * Different types of region snapshot storage types exist: - *
    - *
  • flat/dense snapshots are a simple copy of the region;
    • - *
  • sparse/per-page snapshots are snaapshots which shared - * identical pages.
    • - *
  • privatized (SMPI global variable privatisation). - *
- * - * This is handled with a variant based approch: - * - * * `storage_type` identified the type of storage; - * * an anonymous enum is used to distinguish the relevant types for - * each type. - */ -class RegionSnapshot { -public: - mc_region_type_t region_type; - mc_region_storage_type_t storage_type; - mc_object_info_t object_info; - - /** @brief Virtual address of the region in the simulated process */ - void *start_addr; - - /** @brief Size of the data region in bytes */ - size_t size; - - /** @brief Permanent virtual address of the region - * - * This is usually the same address as the simuilated process address. - * However, when using SMPI privatization of global variables, - * each SMPI process has its own set of global variables stored - * at a different virtual address. The scheduler maps those region - * on the region of the global variables. - * - * */ - void *permanent_addr; - - std::vector flat_data_; - PerPageCopy page_numbers_; - std::vector> privatized_regions_; -public: - RegionSnapshot() : - region_type(MC_REGION_TYPE_UNKNOWN), - storage_type(MC_REGION_STORAGE_TYPE_NONE), - object_info(nullptr), - start_addr(nullptr), - size(0), - permanent_addr(nullptr) - {} - ~RegionSnapshot(); - RegionSnapshot(RegionSnapshot const&) = delete; - RegionSnapshot& operator=(RegionSnapshot const&) = delete; -}; - -} -} - -typedef class simgrid::mc::RegionSnapshot s_mc_mem_region_t, *mc_mem_region_t; - -MC_SHOULD_BE_INTERNAL mc_mem_region_t mc_region_new_sparse( - mc_region_type_t type, void *start_addr, void* data_addr, size_t size); XBT_INTERNAL void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg); -static inline __attribute__ ((always_inline)) -bool mc_region_contain(mc_mem_region_t region, const void* p) -{ - return p >= region->start_addr && - p < (void*)((char*) region->start_addr + region->size); -} - static inline __attribute__((always_inline)) void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region) { - size_t pageno = mc_page_number(region->start_addr, (void*) addr); + size_t pageno = mc_page_number((void*)region->start().address(), (void*) addr); const void* snapshot_page = - region->page_numbers_.page(pageno); + region->page_data().page(pageno); return (char*) snapshot_page + mc_page_offset((void*) addr); } static inline __attribute__((always_inline)) void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index) { - switch (region->storage_type) { - case MC_REGION_STORAGE_TYPE_NONE: + switch (region->storage_type()) { + case simgrid::mc::StorageType::NoData: default: xbt_die("Storage type not supported"); - case MC_REGION_STORAGE_TYPE_FLAT: + case simgrid::mc::StorageType::Flat: { - uintptr_t offset = addr - (uintptr_t) region->start_addr; - return (void *) ((uintptr_t) region->flat_data_.data() + offset); + uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); + return (void *) ((uintptr_t) region->flat_data().data() + offset); } - case MC_REGION_STORAGE_TYPE_CHUNKED: + case simgrid::mc::StorageType::Chunked: return mc_translate_address_region_chunked(addr, region); - case MC_REGION_STORAGE_TYPE_PRIVATIZED: + case simgrid::mc::StorageType::Privatized: { xbt_assert(process_index >=0, "Missing process index for privatized region"); - xbt_assert((size_t) process_index < region->privatized_regions_.size(), + xbt_assert((size_t) process_index < region->privatized_data().size(), "Out of range process index"); - mc_mem_region_t subregion = region->privatized_regions_[process_index].get(); - xbt_assert(subregion, "Missing memory region for process %i", process_index); - return mc_translate_address_region(addr, subregion, process_index); + simgrid::mc::RegionSnapshot& subregion= region->privatized_data()[process_index]; + return mc_translate_address_region(addr, &subregion, process_index); } } } @@ -224,6 +74,8 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region( const void* addr, const s_mc_snapshot_t *snapshot, int process_index); +} + // ***** MC Snapshot /** Ignored data @@ -233,18 +85,47 @@ XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region( * */ typedef struct s_mc_snapshot_ignored_data { void* start; - size_t size; - void* data; + std::vector data; } s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t; typedef struct s_fd_infos{ - char *filename; + std::string filename; int number; off_t current_position; int flags; }s_fd_infos_t, *fd_infos_t; -} +/** Information about a given stack frame + * + */ +typedef struct s_mc_stack_frame { + /** Instruction pointer */ + unw_word_t ip; + /** Stack pointer */ + unw_word_t sp; + unw_word_t frame_base; + dw_frame_t frame; + char* frame_name; + unw_cursor_t unw_cursor; +} s_mc_stack_frame_t, *mc_stack_frame_t; + +typedef struct s_mc_snapshot_stack{ + xbt_dynar_t local_variables; + mc_unw_context_t context; + xbt_dynar_t stack_frames; // mc_stack_frame_t + int process_index; +}s_mc_snapshot_stack_t, *mc_snapshot_stack_t; + +typedef struct s_mc_global_t { + mc_snapshot_t snapshot; + int prev_pair; + char *prev_req; + int initial_communications_pattern_done; + int recv_deterministic; + int send_deterministic; + char *send_diff; + char *recv_diff; +}s_mc_global_t, *mc_global_t; namespace simgrid { namespace mc { @@ -260,17 +141,15 @@ public: // To be private mc_process_t process; int num_state; size_t heap_bytes_used; - mc_mem_region_t* snapshot_regions; - size_t snapshot_regions_count; - xbt_dynar_t enabled_processes; + std::vector> snapshot_regions; + std::set enabled_processes; int privatization_index; - size_t *stack_sizes; + std::vector stack_sizes; xbt_dynar_t stacks; - xbt_dynar_t to_ignore; + std::vector to_ignore; uint64_t hash; - xbt_dynar_t ignored_data; - int total_fd; - fd_infos_t *current_fd; + std::vector ignored_data; + std::vector current_fds; }; } @@ -281,44 +160,12 @@ extern "C" { static inline __attribute__ ((always_inline)) mc_mem_region_t mc_get_region_hinted(void* addr, mc_snapshot_t snapshot, int process_index, mc_mem_region_t region) { - if (mc_region_contain(region, addr)) + if (region->contain(simgrid::mc::remote(addr))) return region; else return mc_get_snapshot_region(addr, snapshot, process_index); } -/** Information about a given stack frame - * - */ -typedef struct s_mc_stack_frame { - /** Instruction pointer */ - unw_word_t ip; - /** Stack pointer */ - unw_word_t sp; - unw_word_t frame_base; - dw_frame_t frame; - char* frame_name; - unw_cursor_t unw_cursor; -} s_mc_stack_frame_t, *mc_stack_frame_t; - -typedef struct s_mc_snapshot_stack{ - xbt_dynar_t local_variables; - mc_unw_context_t context; - xbt_dynar_t stack_frames; // mc_stack_frame_t - int process_index; -}s_mc_snapshot_stack_t, *mc_snapshot_stack_t; - -typedef struct s_mc_global_t { - mc_snapshot_t snapshot; - int prev_pair; - char *prev_req; - int initial_communications_pattern_done; - int recv_deterministic; - int send_deterministic; - char *send_diff; - char *recv_diff; -}s_mc_global_t, *mc_global_t; - static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state); @@ -331,16 +178,6 @@ XBT_INTERNAL void mc_restore_page_snapshot_region( MC_SHOULD_BE_INTERNAL const void* MC_region_read_fragmented( mc_mem_region_t region, void* target, const void* addr, size_t size); -// Deprecated compatibility wrapper -static inline -const void* MC_snapshot_read(mc_snapshot_t snapshot, - simgrid::mc::AddressSpace::ReadMode mode, - void* target, const void* addr, size_t size, int process_index) -{ - return snapshot->read_bytes(target, size, simgrid::mc::remote(addr), - process_index, mode); -} - MC_SHOULD_BE_INTERNAL int MC_snapshot_region_memcmp( const void* addr1, mc_mem_region_t region1, const void* addr2, mc_mem_region_t region2, size_t size); @@ -369,20 +206,20 @@ const void* MC_region_read(mc_mem_region_t region, void* target, const void* add { xbt_assert(region); - uintptr_t offset = (char*) addr - (char*) region->start_addr; + uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); - xbt_assert(mc_region_contain(region, addr), + xbt_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary."); - switch (region->storage_type) { - case MC_REGION_STORAGE_TYPE_NONE: + switch (region->storage_type()) { + case simgrid::mc::StorageType::NoData: default: xbt_die("Storage type not supported"); - case MC_REGION_STORAGE_TYPE_FLAT: - return (char*) region->flat_data_.data() + offset; + case simgrid::mc::StorageType::Flat: + return (char*) region->flat_data().data() + offset; - case MC_REGION_STORAGE_TYPE_CHUNKED: + case simgrid::mc::StorageType::Chunked: { // Last byte of the region: void* end = (char*) addr + size - 1; @@ -397,7 +234,7 @@ const void* MC_region_read(mc_mem_region_t region, void* target, const void* add // 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 MC_REGION_STORAGE_TYPE_PRIVATIZED: + case simgrid::mc::StorageType::Privatized: xbt_die("Storage type not supported"); } } @@ -411,4 +248,8 @@ void* MC_region_read_pointer(mc_mem_region_t region, const void* addr) SG_END_DECL() +XBT_INTERNAL int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, + std::vector* i1, + std::vector* i2); + #endif