X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FMainProgram.java;h=1e4b5cbac508623fff9fd9d5017043818ce1ee42;hp=8dea16d7fe73a5cc0234a6e00998ad964f184513;hb=0df63f38249cbbc584d3a130773680c309fb1f71;hpb=751ee12501d220832b672dd433655a4d65806fd9

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/MainProgram.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/MainProgram.java
index 8dea16d7f..1e4b5cbac 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/MainProgram.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/MainProgram.java
@@ -61,6 +61,7 @@ public class MainProgram implements Runnable, Closeable {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	MainProgram(GraphClientImpl2 client, ClusterManager clusters) {
 
 		this.client = client;
@@ -101,17 +102,15 @@ public class MainProgram implements Runnable, Closeable {
 
 				if(updates.isEmpty()) {
 
-					long start = System.nanoTime();
-
-					operationQueue.waitFor();
+					long duration = operationQueue.waitFor();
 
 					if (!alive)
 						break main;
 
-					long duration = System.nanoTime()-start;
 					if(duration > 4000000000L) {
 						checkIdle();
 					}
+					
 				}
 
 //				long sss = System.nanoTime();
@@ -128,7 +127,7 @@ public class MainProgram implements Runnable, Closeable {
 				try {
 					swapChunks();
 				} catch (AcornAccessVerificationException | IllegalAcornStateException e) {
-				    e.printStackTrace();
+					LOGGER.error("cluster chunk swapping failed", e);
 				} finally {
 					clusters.streamLRU.releaseMutex();
 				}
@@ -146,7 +145,7 @@ public class MainProgram implements Runnable, Closeable {
 			}
 
 		} catch (Throwable t) {
-			t.printStackTrace();
+			LOGGER.error("FATAL: MainProgram died unexpectedly", t);
 		} finally {
 			deathBarrier.release();
 		}
@@ -356,7 +355,7 @@ public class MainProgram implements Runnable, Closeable {
                 executor.awaitTermination(500, TimeUnit.MILLISECONDS);
                 clusterUpdateThreads[i] = null;
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                LOGGER.error("clusterUpdateThread[{}] termination interrupted", i, e);
             }
         }
     }