X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..9a4ec91cc24a9a54ff3a060cc2828ac54d0c0c26:/src/mc/AddressSpace.hpp diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp index 7c75d44bcd..f817bf0d33 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-2023. 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,10 @@ #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. - * - * 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. - */ -template class remote_ptr { - std::uint64_t address_; -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_; } - - operator bool() const - { - return address_; - } - bool operator!() const - { - return !address_; - } - operator remote_ptr() const - { - return remote_ptr(address_); - } - remote_ptr operator+(std::uint64_t n) const - { - return remote_ptr(address_ + n * sizeof(T)); - } - remote_ptr operator-(std::uint64_t n) const - { - return remote_ptr(address_ - n * sizeof(T)); - } - remote_ptr& operator+=(std::uint64_t n) - { - address_ += n * sizeof(T); - return *this; - } - remote_ptr& operator-=(std::uint64_t n) - { - address_ -= n * sizeof(T); - 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; - -/** 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; +namespace simgrid::mc { /** Options for read operations * @@ -139,12 +18,13 @@ const int ProcessIndexAny = 0; * integers are not allowed. */ class ReadOptions { - std::uint32_t value_; + std::uint32_t value_ = 0; constexpr explicit ReadOptions(std::uint32_t value) : value_(value) {} + public: - constexpr ReadOptions() : value_(0) {} + constexpr ReadOptions() = default; - 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 @@ -176,7 +56,7 @@ public: } ReadOptions& operator^=(ReadOptions const& that) { - value_ &= that.value_; + value_ ^= that.value_; return *this; } @@ -199,43 +79,57 @@ public: */ class AddressSpace { private: - Process* process_; + RemoteProcessMemory* remote_process_memory_; + public: - AddressSpace(Process* process) : process_(process) {} - virtual ~AddressSpace(); + explicit AddressSpace(RemoteProcessMemory* process) : remote_process_memory_(process) {} + virtual ~AddressSpace() = default; - simgrid::mc::Process* process() const { return process_; } + /** The process of this address space + * + * This is where we can get debug information, memory layout, etc. + */ + simgrid::mc::RemoteProcessMemory* get_remote_process_memory() const { return remote_process_memory_; } /** 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 */ - virtual const void* read_bytes(void* buffer, std::size_t size, - remote_ptr address, int process_index = ProcessIndexAny, - ReadOptions options = ReadOptions::none()) 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 + { + 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 { - 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); + std::string res; + res.resize(len); + this->read_bytes(&res[0], len, address); + return res; } }; -} -} +} // namespace simgrid::mc #endif