X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54b039b2cb830d851ebe173aaad0a2bbf3129174..27f768c6fbe663c6de000473c44a61222b77d481:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 87e007f402..baaed85e7b 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -1,39 +1,39 @@ -/* Copyright (c) 2007-2014. The SimGrid Team. +/* Copyright (c) 2007-2015. 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. */ -#ifndef MC_SNAPSHOT_H -#define MC_SNAPSHOT_H +#ifndef SIMGRID_MC_SNAPSHOT_H +#define SIMGRID_MC_SNAPSHOT_H + +#include +#include + +#include +#include +#include +#include #include // off_t -#include // size_t #include -#include "../xbt/mmalloc/mmprivate.h" +#include "src/xbt/mmalloc/mmprivate.h" #include -#include +#include -#include "mc_forward.h" -#include "ModelChecker.hpp" -#include "PageStore.hpp" -#include "mc_mmalloc.h" -#include "mc/AddressSpace.hpp" -#include "mc_unw.h" -#include "RegionSnapshot.hpp" +#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" SG_BEGIN_DECL() // ***** Snapshot region -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 region->contain(simgrid::mc::remote(p)); -} +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) @@ -48,20 +48,20 @@ 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: + 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 = (uintptr_t) addr - (uintptr_t) region->start().address(); - return (void *) ((uintptr_t) region->flat_data().data() + offset); + return (void *) ((uintptr_t) region->flat_data().get() + 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"); @@ -73,8 +73,10 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int pr } } -XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region( - const void* addr, const s_mc_snapshot_t *snapshot, int process_index); +XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region( + const void* addr, const simgrid::mc::Snapshot *snapshot, int process_index); + +} // ***** MC Snapshot @@ -85,44 +87,79 @@ XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region( * */ typedef struct s_mc_snapshot_ignored_data { void* start; - size_t size; - void* data; + std::vector data; } s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t; typedef struct s_fd_infos{ - char *filename; + std::string filename; int number; off_t current_position; int flags; }s_fd_infos_t, *fd_infos_t; -} +/** Information about a given stack frame + * + */ +typedef struct s_mc_stack_frame { + /** Instruction pointer */ + unw_word_t ip; + /** Stack pointer */ + unw_word_t sp; + unw_word_t frame_base; + simgrid::mc::Frame* frame; + std::string frame_name; + unw_cursor_t unw_cursor; +} s_mc_stack_frame_t, *mc_stack_frame_t; + +typedef struct s_local_variable{ + simgrid::mc::Frame* subprogram; + unsigned long ip; + std::string name; + simgrid::mc::Type* type; + void *address; + int region; +} s_local_variable_t, *local_variable_t; + +typedef struct XBT_PRIVATE s_mc_snapshot_stack { + std::vector local_variables; + s_mc_unw_context_t 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 Snapshot : public AddressSpace { +class XBT_PRIVATE Snapshot final : public AddressSpace { public: - Snapshot(); + Snapshot(Process* process); ~Snapshot(); const void* read_bytes(void* buffer, std::size_t size, - remote_ptr address, int process_index = ProcessIndexAny, - ReadMode mode = Normal) const MC_OVERRIDE; + RemotePtr address, int process_index = ProcessIndexAny, + ReadOptions options = ReadOptions::none()) const 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; - xbt_dynar_t enabled_processes; + std::size_t heap_bytes_used; + std::vector> snapshot_regions; + std::set enabled_processes; int privatization_index; - size_t *stack_sizes; - xbt_dynar_t stacks; - xbt_dynar_t to_ignore; - uint64_t hash; - xbt_dynar_t ignored_data; - int total_fd; - fd_infos_t *current_fd; + std::vector stack_sizes; + std::vector stacks; + std::vector to_ignore; + std::uint64_t hash; + std::vector ignored_data; + std::vector current_fds; }; } @@ -133,62 +170,44 @@ 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); } -/** Information about a given stack frame - * - */ -typedef struct s_mc_stack_frame { - /** Instruction pointer */ - unw_word_t ip; - /** Stack pointer */ - unw_word_t sp; - unw_word_t frame_base; - dw_frame_t frame; - char* frame_name; - unw_cursor_t unw_cursor; -} s_mc_stack_frame_t, *mc_stack_frame_t; +static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); -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 { - 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; +#ifdef __cplusplus -static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot); +namespace simgrid { +namespace mc { -XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state); -XBT_INTERNAL void MC_restore_snapshot(mc_snapshot_t); +XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state); +XBT_PRIVATE void restore_snapshot(mc_snapshot_t); -XBT_INTERNAL void mc_restore_page_snapshot_region( - mc_process_t process, - void* start_addr, simgrid::mc::PerPageCopy const& pagenos); +} +} + +#endif -MC_SHOULD_BE_INTERNAL const void* MC_region_read_fragmented( - mc_mem_region_t region, void* target, const void* addr, size_t size); +extern "C" { + +XBT_PRIVATE void mc_restore_page_snapshot_region( + simgrid::mc::Process* process, + void* start_addr, simgrid::mc::ChunkedData const& pagenos); -MC_SHOULD_BE_INTERNAL int MC_snapshot_region_memcmp( +const void* MC_region_read_fragmented( + mc_mem_region_t region, void* target, const void* addr, std::size_t size); + +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* 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, size_t size); + const void* addr2, mc_snapshot_t snapshot2, int process_index, std::size_t size); static inline __attribute__ ((always_inline)) const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) @@ -207,24 +226,26 @@ const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot) * @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, size_t size) +const void* MC_region_read( + mc_mem_region_t region, void* target, const void* addr, std::size_t size) { xbt_assert(region); - uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); + std::uintptr_t offset = + (std::uintptr_t) addr - (std::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: + case simgrid::mc::StorageType::NoData: default: xbt_die("Storage type not supported"); - case MC_REGION_STORAGE_TYPE_FLAT: - return (char*) region->flat_data().data() + offset; + case simgrid::mc::StorageType::Flat: + return (char*) region->flat_data().get() + offset; - case MC_REGION_STORAGE_TYPE_CHUNKED: + case simgrid::mc::StorageType::Chunked: { // Last byte of the region: void* end = (char*) addr + size - 1; @@ -239,7 +260,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"); } } @@ -253,4 +274,8 @@ 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