X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd9d52c0c7a9c96221fff2013cdeef05b6e979e2..863aeead864a309c494893a1b06ec33ed2b7daf1:/src/mc/Process.hpp

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index 8b96b0cbbc..19c2e5eb4e 100644
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -19,11 +19,13 @@
 
 #include <simgrid_config.h>
 
-#include <xbt/base.h>
+#include "xbt/base.h"
 #include <xbt/mmalloc.h>
 
 #include "src/xbt/mmalloc/mmprivate.h"
-#include "src/mc/Channel.hpp"
+
+#include "src/mc/remote/Channel.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 
 #include <simgrid/simix.h>
 #include "src/simix/popping_private.h"
@@ -31,25 +33,21 @@
 
 #include "src/xbt/memory_map.hpp"
 
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/mc_base.h"
-#include "src/mc/RemotePtr.hpp"
 #include "src/mc/AddressSpace.hpp"
-#include "src/mc/mc_protocol.h"
 #include "src/mc/ObjectInformation.hpp"
-
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {
 
-class SimixProcessInformation {
+class ActorInformation {
 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);
@@ -136,17 +143,17 @@ public:
   // Heap access:
   xbt_mheap_t get_heap()
   {
-    if (!(this->cache_flags_ & Process::cache_heap))
+    if (not(this->cache_flags_ & Process::cache_heap))
       this->refresh_heap();
     return this->heap.get();
   }
-  malloc_info* get_malloc_info()
+  const malloc_info* get_malloc_info()
   {
-    if (!(this->cache_flags_ & Process::cache_malloc))
+    if (not(this->cache_flags_ & Process::cache_malloc))
       this->refresh_malloc_info();
     return this->heap_info.data();
   }
-  
+
   void clear_cache()
   {
     this->cache_flags_ = Process::cache_none;
@@ -212,33 +219,31 @@ public:
   void unignore_heap(void *address, size_t size);
 
   void ignore_local_variable(const char *var_name, const char *frame_name);
-  std::vector<simgrid::mc::SimixProcessInformation>& simix_processes();
-  std::vector<simgrid::mc::SimixProcessInformation>& old_simix_processes();
+  std::vector<simgrid::mc::ActorInformation>& actors();
+  std::vector<simgrid::mc::ActorInformation>& dead_actors();
 
-  /** Get a local description of a remote SIMIX process */
-  simgrid::mc::SimixProcessInformation* resolveProcessInfo(
-    simgrid::mc::RemotePtr<s_smx_process_t> process)
+  /** Get a local description of a remote SIMIX actor */
+  simgrid::mc::ActorInformation* resolveActorInfo(simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> actor)
   {
     xbt_assert(mc_model_checker != nullptr);
-    if (!process)
+    if (not actor)
       return nullptr;
     this->refresh_simix();
-    for (auto& process_info : this->smx_process_infos)
-      if (process_info.address == process)
-        return &process_info;
-    for (auto& process_info : this->smx_old_process_infos)
-      if (process_info.address == process)
-        return &process_info;
+    for (auto& actor_info : this->smx_actors_infos)
+      if (actor_info.address == actor)
+        return &actor_info;
+    for (auto& actor_info : this->smx_dead_actors_infos)
+      if (actor_info.address == actor)
+        return &actor_info;
     return nullptr;
   }
 
-  /** Get a local copy of the SIMIX process structure */
-  smx_process_t resolveProcess(simgrid::mc::RemotePtr<s_smx_process_t> process)
+  /** Get a local copy of the SIMIX actor structure */
+  simgrid::simix::ActorImpl* resolveActor(simgrid::mc::RemotePtr<simgrid::simix::ActorImpl> process)
   {
-    simgrid::mc::SimixProcessInformation* process_info =
-      this->resolveProcessInfo(process);
-    if (process_info)
-      return &process_info->copy;
+    simgrid::mc::ActorInformation* actor_info = this->resolveActorInfo(process);
+    if (actor_info)
+      return actor_info->copy.getBuffer();
     else
       return nullptr;
   }
@@ -256,7 +261,8 @@ private:
   Channel channel_;
   bool running_ = false;
   std::vector<simgrid::xbt::VmMap> memory_map_;
-  RemotePtr<void> maestro_stack_start_, maestro_stack_end_;
+  RemotePtr<void> maestro_stack_start_;
+  RemotePtr<void> maestro_stack_end_;
   int memory_file = -1;
   std::vector<IgnoredRegion> ignored_regions_;
   bool privatized_ = false;
@@ -274,13 +280,13 @@ public: // Copies of MCed SMX data structures
    *
    *  See mc_smx.c.
    */
-  std::vector<SimixProcessInformation> smx_process_infos;
+  std::vector<ActorInformation> smx_actors_infos;
 
   /** Copy of `simix_global->process_to_destroy`
    *
    *  See mc_smx.c.
    */
-  std::vector<SimixProcessInformation> smx_old_process_infos;
+  std::vector<ActorInformation> smx_dead_actors_infos;
 
 private:
   /** State of the cache (which variables are up to date) */
@@ -316,7 +322,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