From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 4 Apr 2018 16:34:11 +0000 (+0200)
Subject: Reduce code duplication.
X-Git-Tag: v3.20~518
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6db81e17ddbb49af0f135e8bec12274efab13e3d

Reduce code duplication.
---

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 0ac25c0a4f..e7e7070ce3 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -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();
 }