X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e3c0670f37a0c37487fc75c73956290dc086c50..27f768c6fbe663c6de000473c44a61222b77d481:/src/mc/mc_snapshot.h diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index e46045f573..baaed85e7b 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -1,182 +1,83 @@ -/* 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 "mc_model_checker.h" -#include "mc_page_store.h" -#include "mc_mmalloc.h" -#include "mc_address_space.h" +#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() -void mc_softdirty_reset(void); - // ***** Snapshot region -typedef enum e_mc_region_type_t { - MC_REGION_TYPE_UNKNOWN = 0, - MC_REGION_TYPE_HEAP = 1, - MC_REGION_TYPE_DATA = 2 -} mc_region_type_t; - -// TODO, use OO instead of this -typedef enum e_mc_region_storeage_type_t { - MC_REGION_STORAGE_TYPE_NONE = 0, - MC_REGION_STORAGE_TYPE_FLAT = 1, - MC_REGION_STORAGE_TYPE_CHUNKED = 2, - MC_REGION_STORAGE_TYPE_PRIVATIZED = 3 -} mc_region_storage_type_t; - -/** @brief Copy/snapshot of a given memory region - * - * Different types of region snapshot storage types exist: - *
    - *
  • flat/dense snapshots are a simple copy of the region;
    • - *
  • sparse/per-page snapshots are snaapshots which shared - * identical pages.
    • - *
  • privatized (SMPI global variable privatisation). - *
- * - * This is handled with a variant based approch: - * - * * `storage_type` identified the type of storage; - * * an anonymous enum is used to distinguish the relevant types for - * each type. - */ -typedef struct s_mc_mem_region s_mc_mem_region_t, *mc_mem_region_t; - -struct s_mc_mem_region { - mc_region_type_t region_type; - mc_region_storage_type_t storage_type; - mc_object_info_t object_info; - - /** @brief Virtual address of the region in the simulated process */ - void *start_addr; - - /** @brief Size of the data region in bytes */ - size_t size; - - /** @brief Permanent virtual address of the region - * - * This is usually the same address as the simuilated process address. - * However, when using SMPI privatization of global variables, - * each SMPI process has its own set of global variables stored - * at a different virtual address. The scheduler maps those region - * on the region of the global variables. - * - * */ - void *permanent_addr; - - union { - struct { - /** @brief Copy of the snapshot for flat snapshots regions (NULL otherwise) */ - void *data; - } flat; - struct { - /** @brief Pages indices in the page store for per-page snapshots (NULL otherwise) */ - size_t* page_numbers; - } chunked; - struct { - size_t regions_count; - mc_mem_region_t* regions; - } privatized; - }; - -}; - -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); - -static inline __attribute__ ((always_inline)) -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); -} +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(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((void*)region->start().address(), (void*) addr); + const void* snapshot_page = + region->page_data().page(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: + switch (region->storage_type()) { + 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 = addr - (uintptr_t) region->start_addr; - return (void *) ((uintptr_t) region->flat.data + offset); + uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); + return (void *) ((uintptr_t) region->flat_data().get() + offset); } - case MC_REGION_STORAGE_TYPE_CHUNKED: - return mc_translate_address_region(addr, region); + 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"); - xbt_assert((size_t) process_index < region->privatized.regions_count, + xbt_assert((size_t) process_index < region->privatized_data().size(), "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); + simgrid::mc::RegionSnapshot& subregion= region->privatized_data()[process_index]; + return mc_translate_address_region(addr, &subregion, 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 /** Ignored data @@ -186,43 +87,16 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot, int process_i * */ 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; -struct s_mc_snapshot { - mc_process_t process; - s_mc_address_space_t address_space; - size_t heap_bytes_used; - mc_mem_region_t* snapshot_regions; - size_t snapshot_regions_count; - xbt_dynar_t 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; -}; - -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)) - return region; - else - return mc_get_snapshot_region(addr, snapshot, process_index); -} - /** Information about a given stack frame * */ @@ -232,76 +106,115 @@ typedef struct s_mc_stack_frame { /** Stack pointer */ unw_word_t sp; unw_word_t frame_base; - dw_frame_t frame; - char* frame_name; + 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_mc_snapshot_stack{ - xbt_dynar_t local_variables; - xbt_dynar_t stack_frames; // 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; +} s_mc_snapshot_stack_t, *mc_snapshot_stack_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; +namespace simgrid { +namespace mc { + +class XBT_PRIVATE Snapshot final : public AddressSpace { +public: + Snapshot(Process* process); + ~Snapshot(); + const void* read_bytes(void* buffer, std::size_t size, + RemotePtr address, int process_index = ProcessIndexAny, + ReadOptions options = ReadOptions::none()) const override; +public: // To be private + int num_state; + std::size_t heap_bytes_used; + std::vector> snapshot_regions; + std::set enabled_processes; + int privatization_index; + std::vector stack_sizes; + std::vector stacks; + std::vector to_ignore; + std::uint64_t hash; + std::vector ignored_data; + std::vector current_fds; +}; + +} +} + +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 (region->contain(simgrid::mc::remote(addr))) + return region; + else + return mc_get_snapshot_region(addr, snapshot, process_index); +} 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); +} + +#ifdef __cplusplus + +namespace simgrid { +namespace mc { -int mc_important_snapshot(mc_snapshot_t snapshot); +XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state); +XBT_PRIVATE void restore_snapshot(mc_snapshot_t); -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( - mc_process_t process, - void* start_addr, size_t page_count, size_t* pagenos, - uint64_t* pagemap, size_t* reference_pagenos); +} +} + +#endif -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); + +const void* MC_region_read_fragmented( + mc_mem_region_t region, void* target, const void* addr, std::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( const void* addr1, mc_mem_region_t region1, - const void* addr2, mc_mem_region_t region2, size_t size); -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); - -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); -} + 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) { 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 @@ -313,32 +226,32 @@ 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) { - if (region==NULL) - // Should be deprecated: - return addr; + xbt_assert(region); - uintptr_t offset = (char*) addr - (char*) region->start_addr; + 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: + switch (region->storage_type()) { + case simgrid::mc::StorageType::NoData: default: xbt_die("Storage type not supported"); - case MC_REGION_STORAGE_TYPE_FLAT: - return (char*) region->flat.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; 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); @@ -347,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"); } } @@ -361,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