migrate wake_all_waiting_actors from simix::Global to kernel::EngineImpl

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index b119614..257d84f 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -76,6 +76,27 @@ void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::ve
   models_prio_[model_name] = std::move(model);
 }
 
+/** Wake up all actors waiting for a Surf action to finish */
+void EngineImpl::wake_all_waiting_actors() const
+{
+  for (auto const& model : models_) {
+    XBT_DEBUG("Handling the failed actions (if any)");
+    while (auto* action = model->extract_failed_action()) {
+      XBT_DEBUG("   Handling Action %p", action);
+      if (action->get_activity() != nullptr)
+        activity::ActivityImplPtr(action->get_activity())->post();
+    }
+    XBT_DEBUG("Handling the terminated actions (if any)");
+    while (auto* action = model->extract_done_action()) {
+      XBT_DEBUG("   Handling Action %p", action);
+      if (action->get_activity() == nullptr)
+        XBT_DEBUG("probably vcpu's action %p, skip", action);
+      else
+        activity::ActivityImplPtr(action->get_activity())->post();
+    }
+  }
+}
+
 void EngineImpl::run()
 {
   if (MC_record_replay_is_active()) {
@@ -176,7 +197,7 @@ void EngineImpl::run()
 
       simix_global->execute_tasks();
       do {
-        simix_global->wake_all_waiting_actors();
+        wake_all_waiting_actors();
       } while (simix_global->execute_tasks());
 
       /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */
@@ -204,7 +225,7 @@ void EngineImpl::run()
       again = timer::Timer::execute_all();
       if (simix_global->execute_tasks())
         again = true;
-      simix_global->wake_all_waiting_actors();
+      wake_all_waiting_actors();
     } while (again);
 
     /* Clean actors to destroy */

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 151c9ae..dcce9a6 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -63,6 +63,9 @@ public:
       return res->second;
   }
 
+  void wake_all_waiting_actors() const;
+  void display_all_actor_status() const;
+
   /** @brief Run the main simulation loop. */
   void run();
 };

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 618ee85..a45b862 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -198,27 +198,6 @@ void Global::run_all_actors()
   actors_to_run.clear();
 }
 
-/** Wake up all actors waiting for a Surf action to finish */
-void Global::wake_all_waiting_actors() const
-{
-  for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) {
-    XBT_DEBUG("Handling the failed actions (if any)");
-    while (auto* action = model->extract_failed_action()) {
-      XBT_DEBUG("   Handling Action %p", action);
-      if (action->get_activity() != nullptr)
-        kernel::activity::ActivityImplPtr(action->get_activity())->post();
-    }
-    XBT_DEBUG("Handling the terminated actions (if any)");
-    while (auto* action = model->extract_done_action()) {
-      XBT_DEBUG("   Handling Action %p", action);
-      if (action->get_activity() == nullptr)
-        XBT_DEBUG("probably vcpu's action %p, skip", action);
-      else
-        kernel::activity::ActivityImplPtr(action->get_activity())->post();
-    }
-  }
-}
-
 void Global::display_all_actor_status() const
 {
   XBT_INFO("%zu actors are still running, waiting for something.", process_list.size());

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 25ef012..d50f70b 100644 (file)
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -30,7 +30,6 @@ public:
    */
   void empty_trash();
   void run_all_actors();
-  void wake_all_waiting_actors() const;
   void display_all_actor_status() const;
 
   kernel::context::ContextFactory* context_factory = nullptr;