X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/891e867e03bb32439d42d50d0912bb16c4618e90..0cfb40d124549f4dde6f00095847de0d04828adf:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 8960b450a2..38173265fa 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -7,23 +7,24 @@ #ifndef SIMGRID_MC_SNAPSHOT_H #define SIMGRID_MC_SNAPSHOT_H -#include // off_t -#include // size_t +#include +#include #include #include +#include #include +#include // off_t + #include #include "src/xbt/mmalloc/mmprivate.h" #include -#include #include #include "src/mc/mc_forward.hpp" #include "src/mc/ModelChecker.hpp" #include "src/mc/PageStore.hpp" -#include "src/mc/mc_mmalloc.h" #include "src/mc/AddressSpace.hpp" #include "src/mc/mc_unw.h" #include "src/mc/RegionSnapshot.hpp" @@ -37,10 +38,11 @@ XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_ 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((void*)region->start().address(), (void*) addr); - const void* snapshot_page = - region->page_data().page(pageno); - return (char*) snapshot_page + mc_page_offset((void*) addr); + 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; } static inline __attribute__((always_inline)) @@ -54,7 +56,7 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr case simgrid::mc::StorageType::Flat: { uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); - return (void *) ((uintptr_t) region->flat_data() + offset); + return (void *) ((uintptr_t) region->flat_data().get() + offset); } case simgrid::mc::StorageType::Chunked: @@ -121,20 +123,20 @@ typedef struct s_local_variable{ typedef struct XBT_PRIVATE s_mc_snapshot_stack { std::vector local_variables; - s_mc_unw_context_t context; + simgrid::mc::UnwindContext context; std::vector stack_frames; 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; + std::shared_ptr snapshot; + int prev_pair = 0; + std::string prev_req; + int initial_communications_pattern_done = 0; + int recv_deterministic = 0; + int send_deterministic = 0; + char *send_diff = nullptr; + char *recv_diff = nullptr; }s_mc_global_t, *mc_global_t; namespace simgrid { @@ -145,7 +147,7 @@ public: Snapshot(Process* process); ~Snapshot(); const void* read_bytes(void* buffer, std::size_t size, - remote_ptr address, int process_index = ProcessIndexAny, + RemotePtr address, int process_index = ProcessIndexAny, ReadOptions options = ReadOptions::none()) const override; public: // To be private int num_state; @@ -167,7 +169,7 @@ public: // To be private 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) +mc_mem_region_t mc_get_region_hinted(void* addr, simgrid::mc::Snapshot* snapshot, int process_index, mc_mem_region_t region) { if (region->contain(simgrid::mc::remote(addr))) return region; @@ -175,10 +177,24 @@ mc_mem_region_t mc_get_region_hinted(void* addr, mc_snapshot_t snapshot, int pro return mc_get_snapshot_region(addr, snapshot, process_index); } -static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); +static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot); + +} + +#ifdef __cplusplus + +namespace simgrid { +namespace mc { -XBT_PRIVATE mc_snapshot_t MC_take_snapshot(int num_state); -XBT_PRIVATE void MC_restore_snapshot(mc_snapshot_t); +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::Process* process, @@ -191,14 +207,14 @@ 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, mc_snapshot_t snapshot1, - const void* addr2, mc_snapshot_t snapshot2, int process_index, std::size_t size); + const void* addr1, simgrid::mc::Snapshot* snapshot1, + const void* addr2, simgrid::mc::Snapshot* snapshot2, int process_index, std::size_t size); static inline __attribute__ ((always_inline)) -const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) +const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot) { - if(snapshot==NULL) - xbt_die("snapshot is NULL"); + if(snapshot==nullptr) + xbt_die("snapshot is nullptr"); return mc_model_checker->process().get_heap()->breakval; } @@ -228,13 +244,13 @@ const void* MC_region_read( xbt_die("Storage type not supported"); case simgrid::mc::StorageType::Flat: - return (char*) region->flat_data() + offset; + return (char*) region->flat_data().get() + offset; case simgrid::mc::StorageType::Chunked: { // Last byte of the region: void* end = (char*) addr + size - 1; - if (mc_same_page(addr, end) ) { + 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 { @@ -259,8 +275,4 @@ void* MC_region_read_pointer(mc_mem_region_t region, const void* addr) SG_END_DECL() -XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2); - #endif