fix proxy-apps but not the new smpi faulty test

diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index 83f92bb..c57dc8c 100644 (file)
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -41,7 +41,7 @@ public:
 #endif
 
   /** Finalize the default engine and all its dependencies */
-  static void shutdown();
+  void shutdown();
 
   /** Run the simulation after initialization */
   void run() const;

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 8f0b6ca..4d5cf7e 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -209,7 +209,7 @@ void EngineImpl::initialize(int* argc, char** argv)
   s4u::Engine::on_platform_created.connect(surf_presolve);
 
   if (config::get_value<bool>("debug/clean-atexit"))
-    atexit(s4u::Engine::shutdown);
+    atexit(shutdown);
 }
 
 void EngineImpl::shutdown()
@@ -217,13 +217,6 @@ void EngineImpl::shutdown()
   if (EngineImpl::instance_ == nullptr)
     return;
   XBT_DEBUG("EngineImpl::shutdown() called. Simulation's over.");
-  if (instance_->has_actors_to_run() && simgrid_get_clock() <= 0.0) {
-    XBT_CRITICAL("   ");
-    XBT_CRITICAL("The time is still 0, and you still have processes ready to run.");
-    XBT_CRITICAL("It seems that you forgot to run the simulation that you setup.");
-    xbt_die("Bailing out to avoid that stop-before-start madness. Please fix your code.");
-  }
-
 #if HAVE_SMPI
   if (not instance_->actor_list_.empty()) {
     if (smpi_process()->initialized()) {
@@ -235,6 +228,13 @@ void EngineImpl::shutdown()
   }
 #endif
 
+  if (instance_->has_actors_to_run() && simgrid_get_clock() <= 0.0) {
+    XBT_CRITICAL("   ");
+    XBT_CRITICAL("The time is still 0, and you still have processes ready to run.");
+    XBT_CRITICAL("It seems that you forgot to run the simulation that you setup.");
+    xbt_die("Bailing out to avoid that stop-before-start madness. Please fix your code.");
+  }
+
   /* Kill all actors (but maestro) */
   instance_->maestro_->kill_all();
   instance_->run_all_actors();

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index d5f7445..f8f921c 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -88,7 +88,7 @@ public:
   EngineImpl(const EngineImpl&) = delete;
   EngineImpl& operator=(const EngineImpl&) = delete;
   virtual ~EngineImpl();
-  void shutdown();
+  static void shutdown();
 #endif
 
   void initialize(int* argc, char** argv);

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 438d1d4..fa386cd 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -237,5 +237,5 @@ void SD_exit()
 #if SIMGRID_HAVE_JEDULE
   jedule_sd_exit();
 #endif
-  simgrid::s4u::Engine::shutdown();
+  sd_global->engine_->shutdown();
 }