From 6db81e17ddbb49af0f135e8bec12274efab13e3d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 4 Apr 2018 18:34:11 +0200 Subject: [PATCH] Reduce code duplication. --- src/simix/smx_global.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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(); } -- 2.20.1