X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e102dc08a9b3f49204d88b1c22dd2dd7c2c9f79..378d07947ce02213e465faf2dbbe1dd19a28095d:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 279ca5b849..075b9b7880 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -10,6 +10,9 @@ #include // off_t #include // size_t +#include +#include + #include #include "../xbt/mmalloc/mmprivate.h" #include @@ -21,130 +24,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; - -/** @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. - */ -typedef struct s_mc_mem_region s_mc_mem_region_t, *mc_mem_region_t; - -struct s_mc_mem_region { - 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; - - union { - struct { - /** @brief Copy of the snapshot for flat snapshots regions (NULL otherwise) */ - void *data; - } flat; - struct { - /** @brief Pages indices in the page store for per-page snapshots (NULL otherwise) */ - size_t* page_numbers; - } chunked; - struct { - size_t regions_count; - mc_mem_region_t* regions; - } privatized; - }; - -}; - -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); -MC_SHOULD_BE_INTERNAL void MC_region_destroy(mc_mem_region_t reg); 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 snapshot_pageno = region->chunked.page_numbers[pageno]; + size_t pageno = mc_page_number((void*)region->start().address(), (void*) addr); const void* snapshot_page = - mc_model_checker->page_store().get_page(snapshot_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 + 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_count, + 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]; - 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); } } } @@ -190,9 +111,9 @@ public: // To be private size_t heap_bytes_used; mc_mem_region_t* snapshot_regions; size_t snapshot_regions_count; - xbt_dynar_t enabled_processes; + std::set enabled_processes; int privatization_index; - size_t *stack_sizes; + std::vector stack_sizes; xbt_dynar_t stacks; xbt_dynar_t to_ignore; uint64_t hash; @@ -209,7 +130,7 @@ 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); @@ -252,26 +173,13 @@ static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state); XBT_INTERNAL void MC_restore_snapshot(mc_snapshot_t); -XBT_INTERNAL size_t* mc_take_page_snapshot_region(mc_process_t process, - void* data, size_t page_count); -XBT_INTERNAL void mc_free_page_snapshot_region(size_t* pagenos, size_t page_count); XBT_INTERNAL void mc_restore_page_snapshot_region( mc_process_t process, - void* start_addr, size_t page_count, size_t* pagenos); + void* start_addr, simgrid::mc::PerPageCopy const& pagenos); 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); @@ -300,20 +208,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 + 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; @@ -328,7 +236,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"); } }