Convert some config flags to C++ API.

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

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 0ac25c0..386d94c 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -53,7 +53,7 @@ public:
 
 void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr) = nullptr;
 
-int _sg_do_verbose_exit = 1;
+bool _sg_do_verbose_exit = true;
 static void inthandler(int)
 {
   if ( _sg_do_verbose_exit ) {
@@ -529,16 +529,12 @@ void SIMIX_run()
     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.");
-      SIMIX_display_process_status();
-      simgrid::s4u::onDeadlock();
-      xbt_abort();
-
     } else {
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
-      SIMIX_display_process_status();
-      simgrid::s4u::onDeadlock();
-      xbt_abort();
     }
+    SIMIX_display_process_status();
+    simgrid::s4u::onDeadlock();
+    xbt_abort();
   }
   simgrid::s4u::onSimulationEnd();
 }