X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/799a432e8ac74a0a84feb8dbf7a78a14068050b3..1dc3cb7c2d85db5b01f325d54e3f008f5ef6619f:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 2d7942e241..c0811633bd 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -16,7 +16,7 @@
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/Session.hpp"
-#include "src/mc/remote/RemoteClientMemory.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
 
 using simgrid::mc::remote;
 #endif
@@ -43,7 +43,7 @@ void wait_for_requests()
   while (not simix_global->actors_to_run.empty()) {
     simix_global->run_all_actors();
     for (smx_actor_t const& process : simix_global->actors_that_ran) {
-      const s_smx_simcall* req = &process->simcall;
+      const s_smx_simcall* req = &process->simcall_;
       if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
         process->simcall_handle(0);
     }
@@ -70,15 +70,17 @@ void wait_for_requests()
 // Called from both MCer and MCed:
 bool actor_is_enabled(smx_actor_t actor)
 {
+// #del
 #if SIMGRID_HAVE_MC
   // If in the MCer, ask the client app since it has all the data
   if (mc_model_checker != nullptr) {
     return simgrid::mc::session->actor_is_enabled(actor->get_pid());
   }
 #endif
+// #
 
   // Now, we are in the client app, no need for remote memory reading.
-  smx_simcall_t req = &actor->simcall;
+  smx_simcall_t req = &actor->simcall_;
 
   if (req->inspector_ != nullptr)
     return req->inspector_->is_enabled();
@@ -89,8 +91,7 @@ bool actor_is_enabled(smx_actor_t actor)
 
     case SIMCALL_COMM_WAIT: {
       /* FIXME: check also that src and dst processes are not suspended */
-      const kernel::activity::CommImpl* act =
-          static_cast<kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
+      const kernel::activity::CommImpl* act = simcall_comm_wait__getraw__comm(req);
 
       if (act->src_timeout_ || act->dst_timeout_) {
         /* If it has a timeout it will be always be enabled (regardless of who declared the timeout),