X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f12caebeefc7985a0586836248238e475258079..4bcfd40036f842e976d329cd0cee7349b8e0f4d6:/src/mc/AddressSpace.hpp diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp index 18969aaa0a..a7658e6a8f 100644 --- a/src/mc/AddressSpace.hpp +++ b/src/mc/AddressSpace.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2019. 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,31 +6,25 @@ #ifndef SIMGRID_MC_ADDRESS_SPACE_H #define SIMGRID_MC_ADDRESS_SPACE_H -#include -#include -#include -#include -#include - #include "src/mc/mc_forward.hpp" -#include "src/mc/RemotePtr.hpp" +#include "src/mc/remote/RemotePtr.hpp" namespace simgrid { namespace mc { -/** Process index used when no process is available +/** Process index used when no process is available (SMPI privatization) * - * The expected behaviour is that if a process index is needed it will fail. + * The expected behavior is that if a process index is needed it will fail. * */ const int ProcessIndexMissing = -1; -/** Process index used when we don't care about the process index +/** Process index used when we don't care about the process index (SMPI privatization) * */ const int ProcessIndexDisabled = -2; -/** Constant used when any process will do. +/** Constant used when any process will do (SMPI privatization) * - * This is is index of the first process. + * Note: This is is index of the first process. */ const int ProcessIndexAny = 0; @@ -47,7 +40,7 @@ class ReadOptions { public: constexpr ReadOptions() : value_(0) {} - constexpr operator bool() const { return value_ != 0; } + explicit constexpr operator bool() const { return value_ != 0; } constexpr bool operator!() const { return value_ == 0; } constexpr ReadOptions operator|(ReadOptions const& that) const @@ -92,49 +85,6 @@ public: static constexpr ReadOptions lazy() { return ReadOptions(1); } }; -/** A value from another process - * - * This represents a value from another process: - * - * * constructor/destructor are disabled; - * - * * raw memory copy (std::memcpy) is used to copy Remote; - * - * * raw memory comparison is used to compare them; - * - * * when T is a trivial type, Remote is convertible to a T. - * - * We currently only handle the case where the type has the same layout - * in the current process and in the target process: we don't handle - * cross-architecture (such as 32-bit/64-bit access). - */ -template -class Remote { -private: - // If we use a union, it won't work with abstract types: - char buffer[sizeof(T)]; -public: - // HACK, some code currently cast this to T* which is **not** legal. - void* data() { return buffer; } - const void* data() const { return buffer; } - constexpr std::size_t size() const { return sizeof(T); } - operator T() const { - static_assert(std::is_trivial::value, "Cannot convert non trivial type"); - T res; - std::memcpy(&res, buffer, sizeof(T)); - return res; - } - Remote() {} - Remote(T const& x) - { - std::memcpy(&x, buffer, sizeof(T)); - } - Remote& operator=(T const& x) - { - std::memcpy(&x, buffer, sizeof(T)); - } -}; - /** A given state of a given process (abstract base class) * * Currently, this might either be: @@ -142,20 +92,29 @@ public: * * the current state of an existing process; * * * a snapshot. + * + * In order to support SMPI privatization, the can read the memory from the + * context of a given SMPI process: if specified, the code reads data from the + * correct SMPI privatization VMA. */ class AddressSpace { private: - Process* process_; + RemoteClient* process_; + public: - AddressSpace(Process* process) : process_(process) {} - virtual ~AddressSpace(); + explicit AddressSpace(RemoteClient* process) : process_(process) {} + virtual ~AddressSpace() = default; - simgrid::mc::Process* process() const { return process_; } + /** The process of this address space + * + * This is where we can get debug informations, memory layout, etc. + */ + simgrid::mc::RemoteClient* process() const { return process_; } /** Read data from the address space * * @param buffer target buffer for the data - * @param size number of bytes + * @param size number of bytes to read * @param address remote source address of the data * @param process_index which process (used for SMPI privatization) * @param options @@ -166,25 +125,38 @@ public: /** Read a given data structure from the address space */ template inline - void read(T *buffer, RemotePtr ptr, int process_index = ProcessIndexAny) + void read(T *buffer, RemotePtr ptr, int process_index = ProcessIndexAny) const { this->read_bytes(buffer, sizeof(T), ptr, process_index); } template inline - void read(Remote& buffer, RemotePtr ptr, int process_index = ProcessIndexAny) + void read(Remote& buffer, RemotePtr ptr, int process_index = ProcessIndexAny) const { - this->read_bytes(buffer.data(), sizeof(T), ptr, process_index); + this->read_bytes(buffer.getBuffer(), sizeof(T), ptr, process_index); } - /** Read a given data structure from the address space */ + /** Read a given data structure from the addres space + * + * This version returns by value. + */ template inline - Remote read(RemotePtr ptr, int process_index = ProcessIndexMissing) + Remote read(RemotePtr ptr, int process_index = ProcessIndexMissing) const { Remote res; this->read_bytes(&res, sizeof(T), ptr, process_index); return res; } + + /** Read a string of known size */ + std::string read_string(RemotePtr address, std::size_t len) const + { + std::string res; + res.resize(len); + this->read_bytes(&res[0], len, address); + return res; + } + }; }