X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/740d50812a81c59013f22888ab313da5a8113227..3549ebd27861c2514a3f697a128fa05b5ca685e2:/src/mc/RegionSnapshot.hpp diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp index a0031910ec..52deff2007 100644 --- a/src/mc/RegionSnapshot.hpp +++ b/src/mc/RegionSnapshot.hpp @@ -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. */ @@ -13,12 +12,12 @@ #include #include -#include +#include "xbt/base.h" -#include "src/mc/remote_ptr.hpp" -#include "src/mc/PageStore.hpp" #include "src/mc/AddressSpace.hpp" #include "src/mc/ChunkedData.hpp" +#include "src/mc/PageStore.hpp" +#include "src/mc/remote/RemotePtr.hpp" namespace simgrid { namespace mc { @@ -29,7 +28,6 @@ enum class RegionType { Data = 2 }; -// TODO, use Boost.Variant instead of this enum class StorageType { NoData = 0, Flat = 1, @@ -37,22 +35,61 @@ enum class StorageType { Privatized = 3 }; -class data_deleter { -public: - enum Type { - Free, - Munmap - }; +class Buffer { private: - Type type_; + enum class Type { + Malloc, + Mmap + }; + void* data_ = nullptr; std::size_t size_; + Type type_ = Type::Malloc; +private: + Buffer(std::size_t size, Type type = Type::Malloc); + Buffer(void* data, std::size_t size, Type type = Type::Malloc) : + data_(data), size_(size), type_(type) {} public: - data_deleter() : type_(Free) {} - data_deleter(Type type, std::size_t size) : type_(type), size_(size) {} - void operator()(void* p) const; -}; + Buffer() = default; + void clear() noexcept; + ~Buffer() noexcept { clear(); } + + static Buffer malloc(std::size_t size) + { + return Buffer(size, Type::Malloc); + } + static Buffer mmap(std::size_t size) + { + return Buffer(size, Type::Mmap); + } + + // No copy + Buffer(Buffer const& buffer) = delete; + Buffer& operator=(Buffer const& buffer) = delete; + + // Move + Buffer(Buffer&& that) noexcept + : data_(that.data_), size_(that.size_), type_(that.type_) + { + that.data_ = nullptr; + that.size_ = 0; + that.type_ = Type::Malloc; + } + Buffer& operator=(Buffer&& that) noexcept + { + clear(); + data_ = that.data_; + size_ = that.size_; + type_ = that.type_; + that.data_ = nullptr; + that.size_ = 0; + that.type_ = Type::Malloc; + return *this; + } -typedef std::unique_ptr unique_data_ptr; + void* get() { return data_; } + const void* get() const { return data_; } + std::size_t size() const { return size_; } +}; /** A copy/snapshot of a given memory region * @@ -63,9 +100,9 @@ typedef std::unique_ptr unique_data_ptr; * * sparse/per-page snapshots are snaapshots which shared * identical pages. * - * * privatized (SMPI global variable privatisation). + * * privatized (SMPI global variable privatization). * - * This is handled with a variant based approch: + * This is handled with a variant based approach: * * * `storage_type` identified the type of storage; * @@ -77,8 +114,6 @@ public: static const RegionType UnknownRegion = RegionType::Unknown; static const RegionType HeapRegion = RegionType::Heap; static const RegionType DataRegion = RegionType::Data; -public: - typedef unique_data_ptr flat_data_ptr; private: RegionType region_type_; StorageType storage_type_; @@ -101,7 +136,7 @@ private: * */ void *permanent_addr_; - flat_data_ptr flat_data_; + Buffer flat_data_; ChunkedData page_numbers_; std::vector privatized_regions_; public: @@ -121,20 +156,20 @@ public: size_(size), permanent_addr_(permanent_addr) {} - ~RegionSnapshot() {} + ~RegionSnapshot() = default; RegionSnapshot(RegionSnapshot const&) = default; RegionSnapshot& operator=(RegionSnapshot const&) = default; RegionSnapshot(RegionSnapshot&& that) + : region_type_(that.region_type_) + , storage_type_(that.storage_type_) + , object_info_(that.object_info_) + , start_addr_(that.start_addr_) + , size_(that.size_) + , permanent_addr_(that.permanent_addr_) + , flat_data_(std::move(that.flat_data_)) + , page_numbers_(std::move(that.page_numbers_)) + , privatized_regions_(std::move(that.privatized_regions_)) { - region_type_ = that.region_type_; - storage_type_ = that.storage_type_; - object_info_ = that.object_info_; - start_addr_ = that.start_addr_; - size_ = that.size_; - permanent_addr_ = that.permanent_addr_; - flat_data_ = std::move(that.flat_data_); - page_numbers_ = std::move(that.page_numbers_); - privatized_regions_ = std::move(that.privatized_regions_); that.clear(); } RegionSnapshot& operator=(RegionSnapshot&& that) @@ -160,7 +195,7 @@ public: storage_type_ = StorageType::NoData; privatized_regions_.clear(); page_numbers_.clear(); - flat_data_.reset(); + flat_data_.clear(); object_info_ = nullptr; start_addr_ = nullptr; size_ = 0; @@ -170,24 +205,25 @@ public: void clear_data() { storage_type_ = StorageType::NoData; - flat_data_.reset(); + flat_data_.clear(); page_numbers_.clear(); privatized_regions_.clear(); } - - void flat_data(flat_data_ptr data) + + void flat_data(Buffer data) { storage_type_ = StorageType::Flat; flat_data_ = std::move(data); page_numbers_.clear(); privatized_regions_.clear(); } - const char* flat_data() const { return flat_data_.get(); } + const Buffer& flat_data() const { return flat_data_; } + Buffer& flat_data() { return flat_data_; } void page_data(ChunkedData page_data) { storage_type_ = StorageType::Chunked; - flat_data_.reset(); + flat_data_.clear(); page_numbers_ = std::move(page_data); privatized_regions_.clear(); } @@ -196,7 +232,7 @@ public: void privatized_data(std::vector data) { storage_type_ = StorageType::Privatized; - flat_data_.reset(); + flat_data_.clear(); page_numbers_.clear(); privatized_regions_ = std::move(data); } @@ -214,14 +250,14 @@ public: // Other getters - remote_ptr start() const { return remote(start_addr_); } - remote_ptr end() const { return remote((char*)start_addr_ + size_); } - remote_ptr permanent_address() const { return remote(permanent_addr_); } + RemotePtr start() const { return remote(start_addr_); } + RemotePtr end() const { return remote((char*)start_addr_ + size_); } + RemotePtr permanent_address() const { return remote(permanent_addr_); } std::size_t size() const { return size_; } StorageType storage_type() const { return storage_type_; } RegionType region_type() const { return region_type_; } - bool contain(remote_ptr p) const + bool contain(RemotePtr p) const { return p >= start() && p < end(); } @@ -229,19 +265,17 @@ public: RegionSnapshot privatized_region( RegionType region_type, void *start_addr, void* permanent_addr, - std::size_t size, const RegionSnapshot* ref_region); + std::size_t size); RegionSnapshot dense_region( RegionType type, void *start_addr, void* data_addr, std::size_t size); simgrid::mc::RegionSnapshot sparse_region( - RegionType type, void *start_addr, void* data_addr, std::size_t size, - RegionSnapshot const* ref_region); + RegionType type, void *start_addr, void* data_addr, std::size_t size); simgrid::mc::RegionSnapshot region( - RegionType type, void *start_addr, void* data_addr, std::size_t size, - RegionSnapshot const* ref_region); + RegionType type, void *start_addr, void* data_addr, std::size_t size); } } -typedef class simgrid::mc::RegionSnapshot s_mc_mem_region_t, *mc_mem_region_t; - +typedef class simgrid::mc::RegionSnapshot s_mc_mem_region_t; +typedef s_mc_mem_region_t* mc_mem_region_t; #endif