Merge branch 'doc_link' into 'master'

[simgrid.git] / src / mc / mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index a1b7d6c..e503049 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -6,7 +6,7 @@
 #include "simgrid/s4u/Host.hpp"
 
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/remote/RemoteSimulation.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
 
 using simgrid::mc::remote;
 /** @file
@@ -16,10 +16,10 @@ using simgrid::mc::remote;
  *  This is implemented by:
  *
  *   - `model_checker->process.smx_process_infos`
- *      (copy of `simix_global->process_list`);
+ *      (copy of `EngineImpl::actor_list_`);
  *
  *   - `model_checker->process.smx_old_process_infos`
- *      (copy of `simix_global->actors_to_destroy`);
+ *      (copy of `EngineImpl::actors_to_destroy_`);
  *
  *   - `model_checker->hostnames`.
  *
@@ -35,7 +35,7 @@ using simgrid::mc::remote;
  *  @param target       Local vector (to be filled with copies of `s_smx_actor_t`)
  *  @param remote_dynar Address of the process dynar in the remote list
  */
-static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimulation* process,
+static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProcess* process,
                                                  std::vector<simgrid::mc::ActorInformation>& target,
                                                  simgrid::mc::RemotePtr<s_xbt_dynar_t> remote_dynar)
 {
@@ -52,7 +52,6 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimula
     simgrid::mc::ActorInformation info;
 
     info.address  = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
-    info.hostname = nullptr;
     process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
     target.push_back(std::move(info));
   }
@@ -61,31 +60,15 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimula
 namespace simgrid {
 namespace mc {
 
-void RemoteSimulation::refresh_simix()
+void RemoteProcess::refresh_simix()
 {
-  if (this->cache_flags_ & RemoteSimulation::cache_simix_processes)
+  if (this->cache_flags_ & RemoteProcess::cache_simix_processes)
     return;
 
-  // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
+  MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, actors_addr_);
+  MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, dead_actors_addr_);
 
-  static_assert(std::is_same<
-      std::unique_ptr<simgrid::simix::Global>,
-      decltype(simix_global)
-    >::value, "Unexpected type for simix_global");
-  static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*),
-    "Bad size for simix_global");
-
-  RemotePtr<simgrid::simix::Global> simix_global_p{this->read_variable<simgrid::simix::Global*>("simix_global")};
-
-  // simix_global = REMOTE(*simix_global)
-  Remote<simgrid::simix::Global> simix_global =
-    this->read<simgrid::simix::Global>(simix_global_p);
-
-  MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.get_buffer()->actors_vector));
-  MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos,
-                                       remote(simix_global.get_buffer()->dead_actors_vector));
-
-  this->cache_flags_ |= RemoteSimulation::cache_simix_processes;
+  this->cache_flags_ |= RemoteProcess::cache_simix_processes;
 }
 
 }