Slightly improve message on deadlock.

diff --git a/examples/c/actor-exiting/actor-exiting.tesh b/examples/c/actor-exiting/actor-exiting.tesh
index 0c05238..2fb10ee 100644 (file)
--- a/examples/c/actor-exiting/actor-exiting.tesh
+++ b/examples/c/actor-exiting/actor-exiting.tesh
@@ -5,7 +5,7 @@ $ ${bindir:=.}/c-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:[%
 > [  3.000000] (C@Ginette) And now, induce a deadlock by waiting for a message that will never come
 >
 >
-> [  3.000000] (maestro@) Oops! Deadlock or code not perfectly clean.
+> [  3.000000] (maestro@) Oops! Deadlock detected, some activities are still around but will never complete. This usually happens when the user code is not perfectly clean.
 > [  3.000000] (maestro@) 1 actors are still running, waiting for something.
 > [  3.000000] (maestro@) Legend of the following listing: "Actor <pid> (<name>@<host>): <status>"
 > [  3.000000] (maestro@) Actor 3 (C@Ginette): waiting for communication activity 0xdeadbeef () in state WAITING to finish

diff --git a/examples/cpp/actor-exiting/s4u-actor-exiting.tesh b/examples/cpp/actor-exiting/s4u-actor-exiting.tesh
index c46a118..cb81951 100644 (file)
--- a/examples/cpp/actor-exiting/s4u-actor-exiting.tesh
+++ b/examples/cpp/actor-exiting/s4u-actor-exiting.tesh
@@ -9,7 +9,7 @@ $ ${bindir:=.}/s4u-actor-exiting ${platfdir}/small_platform.xml "--log=root.fmt:
 > [  3.000000] (C@Ginette) And now, induce a deadlock by waiting for a message that will never come
 >
 >
-> [  3.000000] (maestro@) Oops! Deadlock or code not perfectly clean.
+> [  3.000000] (maestro@) Oops! Deadlock detected, some activities are still around but will never complete. This usually happens when the user code is not perfectly clean.
 > [  3.000000] (maestro@) 1 actors are still running, waiting for something.
 > [  3.000000] (maestro@) Legend of the following listing: "Actor <pid> (<name>@<host>): <status>"
 > [  3.000000] (maestro@) Actor 3 (C@Ginette): waiting for communication activity 0xdeadbeef () in state WAITING to finish

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 7202ce6..dba451c 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -741,7 +741,8 @@ void EngineImpl::run(double max_date)
         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.");
+        XBT_CRITICAL("Oops! Deadlock detected, some activities are still around but will never complete. "
+                     "This usually happens when the user code is not perfectly clean.");
       }
       display_all_actor_status();
       simgrid::s4u::Engine::on_deadlock();