X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7c2b72c7328c4aade5049a3cc21603a9d27842c..5e102dc08a9b3f49204d88b1c22dd2dd7c2c9f79:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 61baa7eb58..279ca5b849 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -16,16 +16,14 @@ #include #include "mc_forward.h" -#include "mc_model_checker.h" -#include "mc_page_store.h" +#include "ModelChecker.hpp" +#include "PageStore.hpp" #include "mc_mmalloc.h" -#include "mc_address_space.h" +#include "mc/AddressSpace.hpp" #include "mc_unw.h" SG_BEGIN_DECL() -void mc_softdirty_reset(void); - // ***** Snapshot region typedef enum e_mc_region_type_t { @@ -99,9 +97,10 @@ struct s_mc_mem_region { }; -mc_mem_region_t mc_region_new_sparse(mc_region_type_t type, void *start_addr, void* data_addr, size_t size, mc_mem_region_t ref_reg); -void MC_region_destroy(mc_mem_region_t reg); -void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg, mc_mem_region_t ref_reg); +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) @@ -111,46 +110,18 @@ bool mc_region_contain(mc_mem_region_t region, const void* p) } static inline __attribute__((always_inline)) -void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region) +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]; - const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno); - return (char*) snapshot_page + mc_page_offset((void*) addr); + size_t pageno = mc_page_number(region->start_addr, (void*) addr); + size_t snapshot_pageno = region->chunked.page_numbers[pageno]; + const void* snapshot_page = + mc_model_checker->page_store().get_page(snapshot_pageno); + return (char*) snapshot_page + mc_page_offset((void*) addr); } -mc_mem_region_t mc_get_snapshot_region(const void* addr, mc_snapshot_t snapshot, int process_index); - -/** \brief Translate a pointer from process address space to snapshot address space - * - * The address space contains snapshot of the main/application memory: - * this function finds the address in a given snaphot for a given - * real/application address. - * - * For read only memory regions and other regions which are not int the - * snapshot, the address is not changed. - * - * \param addr Application address - * \param snapshot The snapshot of interest (if NULL no translation is done) - * \return Translated address in the snapshot address space - * */ static inline __attribute__((always_inline)) -void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot, int process_index) +void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index) { - - // If not in a process state/clone: - if (!snapshot) { - return (uintptr_t *) addr; - } - - mc_mem_region_t region = mc_get_snapshot_region((void*) addr, snapshot, process_index); - - xbt_assert(mc_region_contain(region, (void*) addr), "Trying to read out of the region boundary."); - - if (!region) { - return (void *) addr; - } - switch (region->storage_type) { case MC_REGION_STORAGE_TYPE_NONE: default: @@ -163,7 +134,7 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot, int process_i } case MC_REGION_STORAGE_TYPE_CHUNKED: - return mc_translate_address_region(addr, region); + return mc_translate_address_region_chunked(addr, region); case MC_REGION_STORAGE_TYPE_PRIVATIZED: { @@ -173,11 +144,14 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot, int process_i "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(addr, snapshot, process_index); + return mc_translate_address_region(addr, subregion, process_index); } } } +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 @@ -198,10 +172,21 @@ typedef struct s_fd_infos{ int flags; }s_fd_infos_t, *fd_infos_t; -struct s_mc_snapshot { +} + +namespace simgrid { +namespace mc { + +class Snapshot : public AddressSpace { +public: + Snapshot(); + ~Snapshot(); + const void* read_bytes(void* buffer, std::size_t size, + remote_ptr address, int process_index = ProcessIndexAny, + ReadMode mode = Normal) const MC_OVERRIDE; +public: // To be private mc_process_t process; int num_state; - s_mc_address_space_t address_space; size_t heap_bytes_used; mc_mem_region_t* snapshot_regions; size_t snapshot_regions_count; @@ -216,6 +201,11 @@ struct s_mc_snapshot { fd_infos_t *current_fd; }; +} +} + +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) { @@ -248,7 +238,6 @@ typedef struct s_mc_snapshot_stack{ typedef struct s_mc_global_t { mc_snapshot_t snapshot; - int raw_mem_set; int prev_pair; char *prev_req; int initial_communications_pattern_done; @@ -258,55 +247,44 @@ typedef struct s_mc_global_t { char *recv_diff; }s_mc_global_t, *mc_global_t; -typedef struct s_mc_checkpoint_ignore_region{ - void *addr; - size_t size; -}s_mc_checkpoint_ignore_region_t, *mc_checkpoint_ignore_region_t; - static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); -mc_snapshot_t MC_take_snapshot(int num_state); -void MC_restore_snapshot(mc_snapshot_t); -void MC_free_snapshot(mc_snapshot_t); +XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state); +XBT_INTERNAL void MC_restore_snapshot(mc_snapshot_t); -int mc_important_snapshot(mc_snapshot_t snapshot); - -size_t* mc_take_page_snapshot_region(mc_process_t process, - void* data, size_t page_count, uint64_t* pagemap, size_t* reference_pages); -void mc_free_page_snapshot_region(size_t* pagenos, size_t page_count); -void mc_restore_page_snapshot_region( +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, - uint64_t* pagemap, size_t* reference_pagenos); + void* start_addr, size_t page_count, size_t* pagenos); -const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, const void* addr, size_t size); +MC_SHOULD_BE_INTERNAL const void* MC_region_read_fragmented( + mc_mem_region_t region, void* target, const void* addr, size_t size); -const void* MC_snapshot_read(mc_snapshot_t snapshot, e_adress_space_read_flags_t flags, - void* target, const void* addr, size_t size, int process_index); -int MC_snapshot_region_memcmp( +// 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); -int MC_snapshot_memcmp( +XBT_INTERNAL int MC_snapshot_memcmp( const void* addr1, mc_snapshot_t snapshot1, const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size); -static inline __attribute__ ((always_inline)) -const void* MC_snapshot_read_pointer(mc_snapshot_t snapshot, const void* addr, int process_index) -{ - void* res; - return *(const void**) MC_snapshot_read(snapshot, MC_ADDRESS_SPACE_READ_FLAGS_LAZY, - &res, addr, sizeof(void*), process_index); -} - static inline __attribute__ ((always_inline)) const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) { if(snapshot==NULL) xbt_die("snapshot is NULL"); - // This is &std_heap->breakval in the target process: - void** addr = &MC_process_get_heap(&mc_model_checker->process)->breakval; - // Read (std_heap->breakval) in the target process (*addr i.e. std_heap->breakval): - return MC_snapshot_read_pointer(snapshot, addr, MC_PROCESS_INDEX_ANY); + return mc_model_checker->process().get_heap()->breakval; } /** @brief Read memory from a snapshot region @@ -320,9 +298,7 @@ const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) static inline __attribute__((always_inline)) const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, size_t size) { - if (region==NULL) - // Should be deprecated: - return addr; + xbt_assert(region); uintptr_t offset = (char*) addr - (char*) region->start_addr; @@ -343,7 +319,7 @@ const void* MC_region_read(mc_mem_region_t region, void* target, const void* add void* end = (char*) addr + size - 1; if (mc_same_page(addr, end) ) { // The memory is contained in a single page: - return mc_translate_address_region((uintptr_t) addr, region); + 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);