X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5d588d76539d285fb67bef1ab477191622b94a9..321102577020b194dfb7ba89e48687952816849e:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index eaaf235c84..1631cd2ec5 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -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,17 +49,17 @@ 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);
     }
   }
 #if SIMGRID_HAVE_MC
   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();
+  for (auto const& [_, actor] : engine->get_actor_list()) {
+    // 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
@@ -74,79 +74,41 @@ void execute_actors()
  *  - if the wait will succeed immediately (if both peer of the comm are there already or if the mutex is available)
  *  - if a timeout is provided, because we can fire the timeout if the transition is not ready without blocking in this
  * transition for ever.
- *
+ * This is controlled in the is_enabled() method of the corresponding observers.
  */
 // Called from both MCer and MCed:
-bool actor_is_enabled(smx_actor_t actor)
+bool actor_is_enabled(kernel::actor::ActorImpl* 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();
 
-  using simix::Simcall;
-  switch (req->call_) {
-    case Simcall::NONE:
-      return false;
-
-    case Simcall::COMM_WAIT: {
-      /* FIXME: check also that src and dst processes are not suspended */
-      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),
-         * because even if the communication is not ready, it can timeout and won't block. */
-        if (_sg_mc_timeout == 1)
-          return true;
-      }
-      /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
-      else if (act->detached() && act->src_actor_ == nullptr && act->state_ == simgrid::kernel::activity::State::READY)
-        return (act->dst_actor_ != nullptr);
-      return (act->src_actor_ && act->dst_actor_);
-    }
-
-    case Simcall::COMM_WAITANY: {
-      simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(req);
-      size_t count                                = simcall_comm_waitany__get__count(req);
-      for (unsigned int index = 0; index < count; ++index) {
-        auto const* comm = comms[index];
-        if (comm->src_actor_ && comm->dst_actor_)
-          return true;
-      }
-      return false;
-    }
-
-    default:
-      /* The rest of the requests are always enabled */
-      return true;
-  }
+  if (req->call_ == kernel::actor::Simcall::Type::NONE)
+    return false;
+  else
+    /* The rest of the requests are always enabled */
+    return true;
 }
 
 /* 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 || req->call_ == Simcall::COMM_WAIT ||
-         req->call_ == Simcall::COMM_WAITANY || req->call_ == Simcall::COMM_TEST || req->call_ == Simcall::COMM_TESTANY;
+  else
+    return false;
 }
 
-}
-}
+} // namespace mc
+} // namespace simgrid