Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
SIMIX_display_process_status becomes Global::display_all_actor_status
[simgrid.git] / src / simix / smx_global.cpp
index f4e0750..d951bcc 100644 (file)
@@ -43,7 +43,7 @@ XBT_ATTRIB_NORETURN static void inthandler(int)
   if (simgrid::simix::cfg_verbose_exit) {
     XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option "
              "'debug/verbose-exit').");
-    SIMIX_display_process_status();
+    simix_global->display_all_actor_status();
   }
   else {
     XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false.");
@@ -72,7 +72,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   } else  if (siginfo->si_signo == SIGSEGV) {
     fprintf(stderr, "Segmentation fault.\n");
 #if HAVE_SMPI
-    if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::NONE) {
+    if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) {
 #if HAVE_PRIVATIZATION
       fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
 #else
@@ -220,6 +220,45 @@ void Global::wake_all_waiting_actors()
   }
 }
 
+void Global::display_all_actor_status()
+{
+  XBT_INFO("%lu actors are still running, waiting for something.", process_list.size());
+  /*  List the actors and their state */
+  XBT_INFO("Legend of the following listing: \"Actor <pid> (<name>@<host>): <status>\"");
+  for (auto const& kv : process_list) {
+    kernel::actor::ActorImpl* actor = kv.second;
+
+    if (actor->waiting_synchro) {
+      const char* synchro_description = "unknown";
+      // we don't care about the Activity type to get its name, use RawImpl
+      const char* name = boost::static_pointer_cast<kernel::activity::ActivityImpl_T<kernel::activity::RawImpl>>(
+                             actor->waiting_synchro)
+                             ->get_cname();
+
+      if (boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(actor->waiting_synchro) != nullptr)
+        synchro_description = "execution";
+
+      if (boost::dynamic_pointer_cast<kernel::activity::CommImpl>(actor->waiting_synchro) != nullptr)
+        synchro_description = "communication";
+
+      if (boost::dynamic_pointer_cast<kernel::activity::SleepImpl>(actor->waiting_synchro) != nullptr)
+        synchro_description = "sleeping";
+
+      if (boost::dynamic_pointer_cast<kernel::activity::RawImpl>(actor->waiting_synchro) != nullptr)
+        synchro_description = "synchronization";
+
+      if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro) != nullptr)
+        synchro_description = "I/O";
+
+      XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(),
+               actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(),
+               name, (int)actor->waiting_synchro->state_);
+    } else {
+      XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
+    }
+  }
+}
+
 config::Flag<double> cfg_breakpoint{
     "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
 } // namespace simix
@@ -250,7 +289,7 @@ void SIMIX_global_init(int *argc, char **argv)
     surf_init(argc, argv); /* Initialize SURF structures */
 
     simix_global.reset(new simgrid::simix::Global());
-    simix_global->maestro_process = nullptr;
+    simix_global->maestro_ = nullptr;
     SIMIX_context_mod_init();
 
     // Either create a new context with maestro or create
@@ -310,7 +349,7 @@ void SIMIX_clean()
 #endif
 
   /* Kill all processes (but maestro) */
-  simix_global->maestro_process->kill_all();
+  simix_global->maestro_->kill_all();
   simix_global->run_all_actors();
   simix_global->empty_trash();
 
@@ -333,8 +372,8 @@ void SIMIX_clean()
 #endif
 
   /* Let's free maestro now */
-  delete simix_global->maestro_process;
-  simix_global->maestro_process = nullptr;
+  delete simix_global->maestro_;
+  simix_global->maestro_ = nullptr;
 
   /* Finish context module and SURF */
   SIMIX_context_mod_exit();
@@ -485,7 +524,7 @@ void SIMIX_run()
       if (simix_global->process_list.size() == simix_global->daemons.size())
         for (auto const& dmon : simix_global->daemons) {
           XBT_DEBUG("Kill %s", dmon->get_cname());
-          simix_global->maestro_process->kill(dmon);
+          simix_global->maestro_->kill(dmon);
         }
     }
 
@@ -514,18 +553,16 @@ void SIMIX_run()
 
     XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(),
               simix_global->actors_to_run.size());
-
   } while (time > -1.0 || not simix_global->actors_to_run.empty());
 
   if (not simix_global->process_list.empty()) {
-
     if (simix_global->process_list.size() <= simix_global->daemons.size()) {
       XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
                    "once the simulation is over. Please fix your on_exit() functions.");
     } else {
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
     }
-    SIMIX_display_process_status();
+    simix_global->display_all_actor_status();
     simgrid::s4u::Engine::on_deadlock();
     xbt_abort();
   }
@@ -554,48 +591,9 @@ double SIMIX_timer_get_date(smx_timer_t timer) // XBT_ATTRIB_DEPRECATED_v329
   return timer ? timer->get_date() : 0;
 }
 
-void SIMIX_display_process_status()
+void SIMIX_display_process_status() // XBT_ATTRIB_DEPRECATED_v329
 {
-  int nbprocess = simix_global->process_list.size();
-
-  XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
-  /*  List the process and their state */
-  XBT_INFO("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
-  for (auto const& kv : simix_global->process_list) {
-    simgrid::kernel::actor::ActorImpl* actor = kv.second;
-
-    if (actor->waiting_synchro) {
-
-      const char* synchro_description = "unknown";
-      // we don't care about the Activity type to get its name, use RawImpl
-      const char* name =
-          boost::static_pointer_cast<simgrid::kernel::activity::ActivityImpl_T<simgrid::kernel::activity::RawImpl>>(
-              actor->waiting_synchro)
-              ->get_cname();
-
-      if (boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro) != nullptr)
-        synchro_description = "execution";
-
-      if (boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro) != nullptr)
-        synchro_description = "communication";
-
-      if (boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro) != nullptr)
-        synchro_description = "sleeping";
-
-      if (boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro) != nullptr)
-        synchro_description = "synchronization";
-
-      if (boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro) != nullptr)
-        synchro_description = "I/O";
-
-      XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(),
-               actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(),
-               name, (int)actor->waiting_synchro->state_);
-    }
-    else {
-      XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
-    }
-  }
+  simix_global->display_all_actor_status();
 }
 
 int SIMIX_is_maestro()
@@ -603,5 +601,5 @@ int SIMIX_is_maestro()
   if (simix_global == nullptr) // SimDag
     return true;
   simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
-  return self == nullptr || self == simix_global->maestro_process;
+  return self == nullptr || self == simix_global->maestro_;
 }