Build ID are somewhat gnu/linux specific.

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

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index e797a0a..9778702 100644 (file)
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -45,8 +45,8 @@ namespace mc {
 class SimixProcessInformation {
 public:
   /** MCed address of the process */
-  RemotePtr<simgrid::simix::Process> address = nullptr;
-  Remote<simgrid::simix::Process> copy;
+  RemotePtr<simgrid::simix::ActorImpl> address = nullptr;
+  Remote<simgrid::simix::ActorImpl> copy;
 
   /** Hostname (owned by `mc_modelchecker->hostnames`) */
   const char* hostname = nullptr;
@@ -109,15 +109,20 @@ public:
   const void* read_bytes(void* buffer, std::size_t size,
     RemotePtr<void> address, int process_index = ProcessIndexAny,
     ReadOptions options = ReadOptions::none()) const override;
+
   void read_variable(const char* name, void* target, size_t size) const;
+  template<class T> void read_variable(const char* name, T* target) const
+  {
+    read_variable(name, target, sizeof(*target));
+  }
   template<class T>
-  T read_variable(const char *name) const
+  Remote<T> read_variable(const char *name) const
   {
-    static_assert(std::is_trivial<T>::value, "Cannot read a non-trivial type");
-    T res;
-    read_variable(name, &res, sizeof(T));
+    Remote<T> res;
+    read_variable(name, res.getBuffer(), sizeof(T));
     return res;
   }
+
   std::string read_string(RemotePtr<char> address) const;
   std::string read_string(RemotePtr<char> address, std::size_t len) const
   {
@@ -219,7 +224,7 @@ public:
 
   /** Get a local description of a remote SIMIX process */
   simgrid::mc::SimixProcessInformation* resolveProcessInfo(
-    simgrid::mc::RemotePtr<simgrid::simix::Process> process)
+    simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> process)
   {
     xbt_assert(mc_model_checker != nullptr);
     if (!process)
@@ -235,7 +240,7 @@ public:
   }
 
   /** Get a local copy of the SIMIX process structure */
-  simgrid::simix::Process* resolveProcess(simgrid::mc::RemotePtr<simgrid::simix::Process> process)
+  simgrid::simix::ActorImpl* resolveProcess(simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> process)
   {
     simgrid::mc::SimixProcessInformation* process_info =
       this->resolveProcessInfo(process);