X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/037ed0177fab7a21eee2439624cbb4c4db8ccc31..5e102dc08a9b3f49204d88b1c22dd2dd7c2c9f79:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index ca274972a1..279ca5b849 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -16,14 +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/AddressSpace.hpp" +#include "mc_unw.h" SG_BEGIN_DECL() -void mc_softdirty_reset(void); - // ***** Snapshot region typedef enum e_mc_region_type_t { @@ -97,58 +97,31 @@ 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, void* p) +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(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(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: @@ -161,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: { @@ -171,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 @@ -196,7 +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; size_t heap_bytes_used; mc_mem_region_t* snapshot_regions; size_t snapshot_regions_count; @@ -211,17 +201,10 @@ struct s_mc_snapshot{ fd_infos_t *current_fd; }; -/** @brief Process index used when no process is available - * - * The expected behaviour is that if a process index is needed it will fail. - * */ -#define MC_NO_PROCESS_INDEX -1 +} +} -/** @brief Process index when any process is suitable - * - * We could use a special negative value in the future. - */ -#define MC_ANY_PROCESS_INDEX 0 +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,66 +231,60 @@ typedef struct s_mc_stack_frame { 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{ +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; - int comm_deterministic; + int recv_deterministic; int send_deterministic; + char *send_diff; + 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 void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); +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* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size); + void* start_addr, size_t page_count, size_t* pagenos); -void* mc_snapshot_read(void* addr, mc_snapshot_t snapshot, int process_index, void* target, size_t size); -int mc_snapshot_region_memcmp( - void* addr1, mc_mem_region_t region1, - void* addr2, mc_mem_region_t region2, size_t size); -int mc_snapshot_memcmp( - void* addr1, mc_snapshot_t snapshot1, - void* addr2, mc_snapshot_t snapshot2, int process_index, 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); -static void* mc_snapshot_read_pointer(void* addr, mc_snapshot_t snapshot, int process_index); - -static inline __attribute__ ((always_inline)) -void* mc_snapshot_read_pointer(void* addr, mc_snapshot_t snapshot, int process_index) +// 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) { - void* res; - return *(void**) mc_snapshot_read(addr, snapshot, process_index, &res, sizeof(void*)); + 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); +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)) - void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) { +const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) +{ if(snapshot==NULL) xbt_die("snapshot is NULL"); - void** addr = &(std_heap->breakval); - return mc_snapshot_read_pointer(addr, snapshot, MC_ANY_PROCESS_INDEX); + return mc_model_checker->process().get_heap()->breakval; } /** @brief Read memory from a snapshot region @@ -319,10 +296,9 @@ static inline __attribute__ ((always_inline)) * @return Pointer where the data is located (target buffer of original location) */ static inline __attribute__((always_inline)) -void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, size_t size) +const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, size_t size) { - if (region==NULL) - return addr; + xbt_assert(region); uintptr_t offset = (char*) addr - (char*) region->start_addr; @@ -341,12 +317,12 @@ void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, { // Last byte of the region: void* end = (char*) addr + size - 1; - if( mc_same_page(addr, end) ) { + 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_snapshot_read_fragmented(addr, region, target, size); + return MC_region_read_fragmented(region, target, addr, size); } } @@ -358,10 +334,10 @@ void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, } static inline __attribute__ ((always_inline)) -void* mc_snapshot_read_pointer_region(void* addr, mc_mem_region_t region) +void* MC_region_read_pointer(mc_mem_region_t region, const void* addr) { void* res; - return *(void**) mc_snapshot_read_region(addr, region, &res, sizeof(void*)); + return *(void**) MC_region_read(region, &res, addr, sizeof(void*)); } SG_END_DECL()