Simplify the Context::stop() and reduce duplication

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 84c8591..3711f92 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -34,7 +34,7 @@ int MC_random(int min, int max)
     return prng.uniform_int(min, max);
   }
   simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
-  return simgrid::kernel::actor::simcall([&observer] { return observer.get_value(); }, &observer);
+  return simgrid::kernel::actor::simcall_answered([&observer] { return observer.get_value(); }, &observer);
 }
 
 namespace simgrid {
@@ -49,8 +49,8 @@ void execute_actors()
   while (engine->has_actors_to_run()) {
     engine->run_all_actors();
     for (auto const& actor : engine->get_actors_that_ran()) {
-      const s_smx_simcall* req = &actor->simcall_;
-      if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req))
+      const kernel::actor::Simcall* req = &actor->simcall_;
+      if (req->call_ != kernel::actor::Simcall::Type::NONE && not simgrid::mc::request_is_visible(req))
         actor->simcall_handle(0);
     }
   }
@@ -58,8 +58,9 @@ void execute_actors()
   engine->reset_actor_dynar();
   for (auto const& kv : engine->get_actor_list()) {
     auto actor = kv.second;
-    if (actor->simcall_.observer_ != nullptr)
-      actor->simcall_.mc_max_consider_ = actor->simcall_.observer_->get_max_consider();
+    // Only visible requests remain at this point, and they all have an observer
+    actor->simcall_.mc_max_consider_ = actor->simcall_.observer_->get_max_consider();
+
     engine->add_actor_to_dynar(actor);
   }
 #endif
@@ -79,22 +80,17 @@ void execute_actors()
 // 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_singleton->actor_is_enabled(actor->get_pid());
-  }
+  xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
 #endif
-// #
 
   // Now, we are in the client app, no need for remote memory reading.
-  smx_simcall_t req = &actor->simcall_;
+  kernel::actor::Simcall* req = &actor->simcall_;
 
   if (req->observer_ != nullptr)
     return req->observer_->is_enabled();
 
-  if (req->call_ == simix::Simcall::NONE)
+  if (req->call_ == kernel::actor::Simcall::Type::NONE)
     return false;
   else
     /* The rest of the requests are always enabled */
@@ -104,17 +100,16 @@ bool actor_is_enabled(smx_actor_t actor)
 /* This is the list of requests that are visible from the checker algorithm.
  * Any other requests are handled right away on the application side.
  */
-bool request_is_visible(const s_smx_simcall* req)
+bool request_is_visible(const kernel::actor::Simcall* req)
 {
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
 #endif
   if (req->observer_ != nullptr)
     return req->observer_->is_visible();
-
-  using simix::Simcall;
-  return req->call_ == Simcall::COMM_ISEND || req->call_ == Simcall::COMM_IRECV;
+  else
+    return false;
 }
 
-}
-}
+} // namespace mc
+} // namespace simgrid