[Swift-commit] r6395 - branches/release-0.94/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-03-18 03:16:37 -0500 (Mon, 18 Mar 2013)
New Revision: 6395

Modified:
   branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java
Log:
make sure hang checker is not triggered if there is some long running task; the purpose of the hang checker is to detect deadlocks, and those involve no running tasks (see bug 823)

Modified: branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java
===================================================================
--- branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java	2013-03-18 08:04:48 UTC (rev 6394)
+++ branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java	2013-03-18 08:16:37 UTC (rev 6395)
@@ -65,7 +65,8 @@
             if (s != null) {
                 int running = s.getRunning();
                 boolean allOverloaded = s.allOverloaded();
-                if (running == 0 && EventBus.eventCount == lastEventCount && !allOverloaded) {
+                if (running == 0 && EventBus.eventCount == lastEventCount && 
+                        !EventBus.getBus().isAnythingRunning() && !allOverloaded) {
                     logger.warn("No events in " + (CHECK_INTERVAL / 1000) + "s.");
                     ByteArrayOutputStream os = new ByteArrayOutputStream();
                     PrintStream ps = new PrintStream(os);