MC: rename remote/RemoteClient -> remote/RemoteClientMemory and remove networking...

[simgrid.git] / src / mc / AddressSpace.hpp

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index f0b6280..00be2d0 100644 (file)
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. 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. */
@@ -19,10 +19,11 @@ namespace mc {
  *  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() {}
 
   explicit constexpr operator bool() const { return value_ != 0; }
   constexpr bool operator!() const { return value_ == 0; }
@@ -56,7 +57,7 @@ public:
   }
   ReadOptions& operator^=(ReadOptions const& that)
   {
-    value_ &= that.value_;
+    value_ ^= that.value_;
     return *this;
   }
 
@@ -83,17 +84,17 @@ public:
  */
 class AddressSpace {
 private:
-  RemoteClient* process_;
+  RemoteClientMemory* process_;
 
 public:
-  explicit AddressSpace(RemoteClient* process) : process_(process) {}
+  explicit AddressSpace(RemoteClientMemory* 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_; }
+  simgrid::mc::RemoteClientMemory* process() const { return process_; }
 
   /** Read data from the address space
    *
@@ -102,15 +103,15 @@ public:
    *  @param address       remote source address of the data
    *  @param options
    */
-  virtual const void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
-                                 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) const { this->read_bytes(buffer, sizeof(T), ptr); }
 
   template <class T> inline void read(Remote<T>& buffer, RemotePtr<T> ptr) const
   {
-    this->read_bytes(buffer.getBuffer(), sizeof(T), ptr);
+    this->read_bytes(buffer.get_buffer(), sizeof(T), ptr);
   }
 
   /** Read a given data structure from the address space
@@ -132,7 +133,6 @@ public:
     this->read_bytes(&res[0], len, address);
     return res;
   }
-
 };
 
 }