X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ad36dfbb967ce1dabc6ba460ab149d25675be7f..64a60fa58ca5dc30df8b2780c4901773f219d8ea:/src/mc/mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 30798273d3..337c8201bd 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -6,9 +6,28 @@
 #include "simgrid/s4u/Host.hpp"
 
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/mc_smx.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
 
 using simgrid::mc::remote;
+/** @file
+ *  @brief (Cross-process, MCer/MCed) Access to SMX structures
+ *
+ *  We copy some C data structure from the MCed process in the MCer process.
+ *  This is implemented by:
+ *
+ *   - `model_checker->process.smx_process_infos`
+ *      (copy of `simix_global->process_list`);
+ *
+ *   - `model_checker->process.smx_old_process_infos`
+ *      (copy of `simix_global->actors_to_destroy`);
+ *
+ *   - `model_checker->hostnames`.
+ *
+ * The process lists are currently refreshed each time MCed code is executed.
+ * We don't try to give a persistent MCer address for a given MCed process.
+ * For this reason, a MCer simgrid::mc::Process* is currently not reusable after
+ * MCed code.
+ */
 
 /** Load the remote list of processes into a vector
  *
@@ -16,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)
 {
@@ -42,42 +61,20 @@ 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`
+  RemotePtr<s_xbt_dynar_t> actor_vector;
+  RemotePtr<s_xbt_dynar_t> dead_actor_vector;
+  get_actor_vectors(actor_vector, dead_actor_vector);
 
-  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");
+  MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, actor_vector);
+  MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, dead_actor_vector);
 
-  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;
 }
 
 }
 }
-
-unsigned long MC_smx_get_maxpid()
-{
-  unsigned long maxpid;
-  const char* name = "simgrid::kernel::actor::maxpid";
-  if (mc_model_checker->get_remote_simulation().find_variable(name) == nullptr)
-    name = "maxpid"; // We seem to miss the namespaces when compiling with GCC
-  mc_model_checker->get_remote_simulation().read_variable(name, &maxpid, sizeof(maxpid));
-  return maxpid;
-}