Port simcall_process_suspend to the modernity

[simgrid.git] / src / simix / smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 9ad348e..2662eba 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -171,7 +171,7 @@ void Global::empty_trash()
   while (not actors_to_destroy.empty()) {
     smx_actor_t actor = &actors_to_destroy.front();
     actors_to_destroy.pop_front();
-    XBT_DEBUG("Getting rid of %p", actor);
+    XBT_DEBUG("Getting rid of %s (refcount: %d)", actor->get_cname(), actor->get_refcount());
     intrusive_ptr_release(actor);
   }
 #if SIMGRID_HAVE_MC
@@ -338,13 +338,13 @@ static void SIMIX_wake_processes()
   for (auto const& model : all_existing_models) {
     simgrid::kernel::resource::Action* action;
 
-    XBT_DEBUG("Handling the processes whose action failed (if any)");
+    XBT_DEBUG("Handling the failed actions (if any)");
     while ((action = model->extract_failed_action())) {
       XBT_DEBUG("   Handling Action %p",action);
       if (action->get_activity() != nullptr)
         simgrid::kernel::activity::ActivityImplPtr(action->get_activity())->post();
     }
-    XBT_DEBUG("Handling the processes whose action terminated normally (if any)");
+    XBT_DEBUG("Handling the terminated actions (if any)");
     while ((action = model->extract_done_action())) {
       XBT_DEBUG("   Handling Action %p",action);
       if (action->get_activity() == nullptr)
@@ -426,7 +426,7 @@ void SIMIX_run()
        *        - If a process is added because it's getting killed, its subsequent actions shouldn't matter
        *        - If a process gets added to actors_to_run because one of their blocking action constituting the meat
        *          of a simcall terminates, we're still good. Proof:
-       *          - You are added from SIMIX_simcall_answer() only. When this function is called depends on the resource
+       *          - You are added from ActorImpl::simcall_answer() only. When this function is called depends on the resource
        *            kind (network, cpu, disk, whatever), but the same arguments hold. Let's take communications as an
        *            example.
        *          - For communications, this function is called from SIMIX_comm_finish().
@@ -468,7 +468,7 @@ void SIMIX_run()
 
       for (smx_actor_t const& process : simix_global->actors_that_ran) {
         if (process->simcall.call != SIMCALL_NONE) {
-          SIMIX_simcall_handle(&process->simcall, 0);
+          process->simcall_handle(0);
         }
       }