X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/742074df00e1d14c35f8505924d26036b9b8cac5..97b1421930b3e7d2a0e9fc7c501486a6d0b2d402:/src/mc/AddressSpace.hpp

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index 2fc18eab35..e9d152c484 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-2021. 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,37 +6,12 @@
 #ifndef SIMGRID_MC_ADDRESS_SPACE_H
 #define SIMGRID_MC_ADDRESS_SPACE_H
 
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <type_traits>
-
-#include <string>
-#include <vector>
-
 #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
- *
- *  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
- * */
-const int ProcessIndexDisabled = -2;
-
-/** Constant used when any process will do.
- *
- *  This is is index of the first process.
- */
-const int ProcessIndexAny = 0;
-
 /** Options for read operations
  *
  *  This is a set of flags managed with bitwise operators. Only the
@@ -45,12 +19,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
@@ -82,7 +57,7 @@ public:
   }
   ReadOptions& operator^=(ReadOptions const& that)
   {
-    value_ &= that.value_;
+    value_ ^= that.value_;
     return *this;
   }
 
@@ -102,59 +77,62 @@ 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_;
+  RemoteProcess* remote_process_;
+
 public:
-  AddressSpace(Process* process) : process_(process) {}
-  virtual ~AddressSpace();
+  explicit AddressSpace(RemoteProcess* process) : remote_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 information, memory layout, etc.
+   */
+  simgrid::mc::RemoteProcess* get_remote_process() const { return remote_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
    */
-  virtual const void* read_bytes(void* buffer, std::size_t size,
-    RemotePtr<void> address, int process_index = ProcessIndexAny,
-    ReadOptions options = ReadOptions::none()) const = 0;
+  virtual void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
+                           ReadOptions options = ReadOptions::none()) const = 0;
 
   /** Read a given data structure from the address space */
-  template<class T> inline
-  void read(T *buffer, RemotePtr<T> ptr, int process_index = ProcessIndexAny) const
-  {
-    this->read_bytes(buffer, sizeof(T), ptr, process_index);
-  }
+  template <class T> inline void read(T* buffer, RemotePtr<T> ptr) const { this->read_bytes(buffer, sizeof(T), ptr); }
 
-  template<class T> inline
-  void read(Remote<T>& buffer, RemotePtr<T> ptr, int process_index = ProcessIndexAny) const
+  template <class T> inline void read(Remote<T>& buffer, RemotePtr<T> ptr) const
   {
-    this->read_bytes(buffer.getBuffer(), sizeof(T), ptr, process_index);
+    this->read_bytes(buffer.get_buffer(), sizeof(T), ptr);
   }
 
-  /** Read a given data structure from the address space */
-  template<class T> inline
-  Remote<T> read(RemotePtr<T> ptr, int process_index = ProcessIndexMissing) const
+  /** Read a given data structure from the address space
+   *
+   *  This version returns by value.
+   */
+  template <class T> inline Remote<T> read(RemotePtr<T> ptr) const
   {
     Remote<T> res;
-    this->read_bytes(&res, sizeof(T), ptr, process_index);
+    this->read_bytes(&res, sizeof(T), ptr);
     return res;
   }
 
+  /** Read a string of known size */
   std::string read_string(RemotePtr<char> address, std::size_t len) const
   {
-    // TODO, use std::vector with .data() in C++17 to avoid useless copies
-    std::vector<char> buffer(len);
-    buffer[len] = '\0';
-    this->read_bytes(buffer.data(), len, address);
-    return std::string(buffer.data(), buffer.size());
+    std::string res;
+    res.resize(len);
+    this->read_bytes(&res[0], len, address);
+    return res;
   }
-
 };
 
 }