X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbf8aab8704722fb68397b9b1c15251e79efac6a..9692d43fa911bdc2d6d0263a3cb3e22d5e3167fe:/src/mc/Process.hpp

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index 10bd3b547d..97787020e0 100644
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -45,11 +45,9 @@ namespace mc {
 class SimixProcessInformation {
 public:
   /** MCed address of the process */
-  RemotePtr<s_smx_process_t> address = nullptr;
-  union {
-    /** (Flat) Copy of the process data structure */
-    struct s_smx_process copy;
-  };
+  RemotePtr<simgrid::simix::ActorImpl> address = nullptr;
+  Remote<simgrid::simix::ActorImpl> copy;
+
   /** Hostname (owned by `mc_modelchecker->hostnames`) */
   const char* hostname = nullptr;
   std::string name;
@@ -76,13 +74,13 @@ struct IgnoredHeapRegion {
 
 /** Representation of a process
  *
- *  This class is mixing a lot of different responsabilities and is tied
+ *  This class is mixing a lot of different responsibilities and is tied
  *  to SIMIX. It should probably be split into different classes.
  *
- *  Responsabilities:
+ *  Responsibilities:
  *
  *  - reading from the process memory (`AddressSpace`);
- *  - accessing the system state of the porcess (heap, …);
+ *  - accessing the system state of the process (heap, …);
  *  - storing the SIMIX state of the process;
  *  - privatization;
  *  - communication with the model-checked process;
@@ -111,16 +109,25 @@ 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<void> address) const;
+
+  std::string read_string(RemotePtr<char> address) const;
+  std::string read_string(RemotePtr<char> address, std::size_t len) const
+  {
+    return AddressSpace::read_string(address, len);
+  }
 
   // Write memory:
   void write_bytes(const void* buffer, size_t len, RemotePtr<void> address);
@@ -217,9 +224,9 @@ public:
 
   /** Get a local description of a remote SIMIX process */
   simgrid::mc::SimixProcessInformation* resolveProcessInfo(
-    simgrid::mc::RemotePtr<s_smx_process_t> process)
+    simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> process)
   {
-    xbt_assert(mc_mode == MC_MODE_SERVER);
+    xbt_assert(mc_model_checker != nullptr);
     if (!process)
       return nullptr;
     this->refresh_simix();
@@ -233,12 +240,12 @@ public:
   }
 
   /** Get a local copy of the SIMIX process structure */
-  smx_process_t resolveProcess(simgrid::mc::RemotePtr<s_smx_process_t> process)
+  simgrid::simix::ActorImpl* resolveProcess(simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> process)
   {
     simgrid::mc::SimixProcessInformation* process_info =
       this->resolveProcessInfo(process);
     if (process_info)
-      return &process_info->copy;
+      return process_info->copy.getBuffer();
     else
       return nullptr;
   }
@@ -316,7 +323,7 @@ public: // Libunwind-data
    */
   unw_addr_space_t unw_addr_space;
 
-  /** Underlying libunwind addres-space
+  /** Underlying libunwind address-space
    *
    *  The `find_proc_info`, `put_unwind_info`, `get_dyn_info_list_addr`
    *  operations of the native MC address space is currently delegated