X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5bcd7eea68c22b0cddc7b9ab8097eede4ea70409..10d9db5b4ff140f64b8cbf8150c1f84887e95a8e:/src/mc/AddressSpace.hpp diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp index 41f1f8bcf5..d14040e0f2 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,130 +6,68 @@ #ifndef SIMGRID_MC_ADDRESS_SPACE_H #define SIMGRID_MC_ADDRESS_SPACE_H -#include -#include -#include - -#include - #include "src/mc/mc_forward.hpp" +#include "src/mc/remote/RemotePtr.hpp" namespace simgrid { namespace mc { -/** Pointer to a remote address-space (process, snapshot) - * - * With this we can clearly identify the expected type of an address in the - * remote process while avoiding to use native local pointers. +/** Options for read operations * - * Some operators (+/-) assume use the size of the underlying element. This - * only works if the target applications is using the same target: it won't - * work for example, when inspecting a 32 bit application from a 64 bit - * model-checker. + * This is a set of flags managed with bitwise operators. Only the + * meaningful operations are defined: addition, conversions to/from + * integers are not allowed. */ -template class remote_ptr { - std::uint64_t address_; +class ReadOptions { + std::uint32_t value_; + constexpr explicit ReadOptions(std::uint32_t value) : value_(value) {} public: - remote_ptr() : address_(0) {} - remote_ptr(std::uint64_t address) : address_(address) {} - remote_ptr(T* address) : address_((std::uintptr_t)address) {} - std::uint64_t address() const { return address_; } + constexpr ReadOptions() : value_(0) {} - operator bool() const + explicit constexpr operator bool() const { return value_ != 0; } + constexpr bool operator!() const { return value_ == 0; } + + constexpr ReadOptions operator|(ReadOptions const& that) const { - return address_; + return ReadOptions(value_ | that.value_); } - bool operator!() const + constexpr ReadOptions operator&(ReadOptions const& that) const { - return !address_; + return ReadOptions(value_ & that.value_); } - operator remote_ptr() const + constexpr ReadOptions operator^(ReadOptions const& that) const { - return remote_ptr(address_); + return ReadOptions(value_ ^ that.value_); } - remote_ptr operator+(std::uint64_t n) const + constexpr ReadOptions operator~() const { - return remote_ptr(address_ + n * sizeof(T)); + return ReadOptions(~value_); } - remote_ptr operator-(std::uint64_t n) const + + ReadOptions& operator|=(ReadOptions const& that) { - return remote_ptr(address_ - n * sizeof(T)); + value_ |= that.value_; + return *this; } - remote_ptr& operator+=(std::uint64_t n) + ReadOptions& operator&=(ReadOptions const& that) { - address_ += n * sizeof(T); + value_ &= that.value_; return *this; } - remote_ptr& operator-=(std::uint64_t n) + ReadOptions& operator^=(ReadOptions const& that) { - address_ -= n * sizeof(T); + value_ &= that.value_; return *this; } -}; - -template -bool operator<(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() < y.address(); -} - -template -bool operator>(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() > y.address(); -} - -template -bool operator>=(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() >= y.address(); -} - -template -bool operator<=(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() <= y.address(); -} - -template -bool operator==(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() == y.address(); -} - -template -bool operator!=(remote_ptr const& x, remote_ptr const& y) -{ - return x.address() != y.address(); -} - -template inline -remote_ptr remote(T *p) -{ - return remote_ptr(p); -} -template inline -remote_ptr remote(uint64_t p) -{ - return remote_ptr(p); -} - -/** Process index used when no process is available - * - * The expected behaviour is that if a process index is needed it will fail. - * */ -const int ProcessIndexMissing = -1; + /** Copy the data to the given buffer */ + static constexpr ReadOptions none() { return ReadOptions(0); } -/** Process index used when we don't care about the process index - * */ -const int ProcessIndexDisabled = -2; - -/** Constant used when any process will do. - * - * This is is index of the first process. - */ -const int ProcessIndexAny = 0; + /** Allows to return a pointer to another buffer where the data is + * available instead of copying the data into the buffer + */ + static constexpr ReadOptions lazy() { return ReadOptions(1); } +}; /** A given state of a given process (abstract base class) * @@ -139,58 +76,63 @@ const int ProcessIndexAny = 0; * * 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: - enum ReadMode { - - /** Copy the data to the given buffer */ - Normal, - - /** Allows the `read_bytes` to return a pointer to another buffer - * where the data is available instead of copying the data into the - * buffer. - * - * This adds quite a level of ugliness but it was found to more - * efficient at some point. We should check if there is still - * a noticeable different and get rid of it. - */ - Lazy - }; - AddressSpace(Process* process) : process_(process) {} - virtual ~AddressSpace(); - - simgrid::mc::Process* process() const { return process_; } + explicit AddressSpace(RemoteClient* process) : process_(process) {} + virtual ~AddressSpace() = default; + + /** 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 mode + * @param options */ - virtual const void* read_bytes(void* buffer, std::size_t size, - remote_ptr address, int process_index = ProcessIndexAny, - ReadMode mode = Normal) const = 0; + virtual void* read_bytes(void* buffer, std::size_t size, RemotePtr address, + ReadOptions options = ReadOptions::none()) const = 0; /** Read a given data structure from the address space */ - template inline - void read(T *buffer, remote_ptr ptr, int process_index = ProcessIndexAny) + template inline void read(T* buffer, RemotePtr ptr) const { this->read_bytes(buffer, sizeof(T), ptr); } + + template inline void read(Remote& buffer, RemotePtr ptr) const { - this->read_bytes(buffer, sizeof(T), ptr, process_index); + this->read_bytes(buffer.get_buffer(), sizeof(T), ptr); } - /** Read a given data structure from the address space */ - template inline - T read(remote_ptr ptr, int process_index = ProcessIndexMissing) + /** Read a given data structure from the address space + * + * This version returns by value. + */ + template inline Remote read(RemotePtr ptr) const { - static_assert(std::is_trivial::value, "Cannot read a non-trivial type"); - T res; - return *(T*)this->read_bytes(&res, sizeof(T), ptr, process_index); + Remote res; + this->read_bytes(&res, sizeof(T), ptr); + 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; + } + }; }