X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc48db087894fd960073b3120cebf90e6b2f8c02..bcb5cde966bef9e174da1c93cdb2158c0880a613:/src/mc/mc_snapshot.h?ds=sidebyside diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index ff3551f95d..a5c7c17560 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,27 +6,15 @@ #ifndef SIMGRID_MC_SNAPSHOT_H #define SIMGRID_MC_SNAPSHOT_H -#include -#include - #include #include #include #include -#include // off_t - -#include -#include "src/xbt/mmalloc/mmprivate.h" -#include -#include - -#include "src/mc/mc_forward.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/PageStore.hpp" -#include "src/mc/AddressSpace.hpp" -#include "src/mc/mc_unw.h" #include "src/mc/RegionSnapshot.hpp" +#include "src/mc/mc_forward.hpp" +#include "src/mc/mc_unw.h" SG_BEGIN_DECL() @@ -35,8 +22,7 @@ SG_BEGIN_DECL() XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_region_t reg); -static inline __attribute__((always_inline)) -void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region) +static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region) { auto split = simgrid::mc::mmu::split(addr - region->start().address()); auto pageno = split.first; @@ -45,8 +31,7 @@ void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region return (char*) snapshot_page + offset; } -static inline __attribute__((always_inline)) -void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index) +static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index) { switch (region->storage_type()) { case simgrid::mc::StorageType::NoData: @@ -123,29 +108,18 @@ 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; -}s_mc_global_t, *mc_global_t; - namespace simgrid { namespace mc { class XBT_PRIVATE Snapshot final : public AddressSpace { public: - Snapshot(Process* process); - ~Snapshot(); + Snapshot(Process* process, int num_state); + ~Snapshot() = default; const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, ReadOptions options = ReadOptions::none()) const override; @@ -168,8 +142,8 @@ 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) +static XBT_ALWAYS_INLINE 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; @@ -177,7 +151,7 @@ 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); } @@ -186,8 +160,8 @@ static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); namespace simgrid { namespace mc { -XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state); -XBT_PRIVATE void restore_snapshot(mc_snapshot_t); +XBT_PRIVATE std::shared_ptr take_snapshot(int num_state); +XBT_PRIVATE void restore_snapshot(std::shared_ptr snapshot); } } @@ -207,14 +181,13 @@ 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) +static XBT_ALWAYS_INLINE 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; } @@ -226,17 +199,14 @@ const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) * @param size Size of the data to read in bytes * @return Pointer where the data is located (target buffer of original location) */ -static inline __attribute__((always_inline)) -const void* MC_region_read( - mc_mem_region_t region, void* target, const void* addr, std::size_t size) +static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, + std::size_t size) { xbt_assert(region); - std::uintptr_t offset = - (std::uintptr_t) addr - (std::uintptr_t) region->start().address(); + std::uintptr_t offset = (std::uintptr_t)addr - (std::uintptr_t)region->start().address(); - xbt_assert(region->contain(simgrid::mc::remote(addr)), - "Trying to read out of the region boundary."); + xbt_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary."); switch (region->storage_type()) { case simgrid::mc::StorageType::NoData: @@ -266,8 +236,7 @@ const void* MC_region_read( } } -static inline __attribute__ ((always_inline)) -void* MC_region_read_pointer(mc_mem_region_t region, const void* addr) +static XBT_ALWAYS_INLINE void* MC_region_read_pointer(mc_mem_region_t region, const void* addr) { void* res; return *(void**) MC_region_read(region, &res, addr, sizeof(void*)); @@ -275,8 +244,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