Use structured binding declarations (sonar, c++17).

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

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c6072ea..1631cd2 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -49,15 +49,14 @@ 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;
+  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();
 
@@ -78,19 +77,19 @@ void execute_actors()
  * 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)
 {
 #if SIMGRID_HAVE_MC
   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 */
@@ -100,7 +99,7 @@ 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");