Changeset 2145

Timestamp:

07/07/09 12:49:24 (15 years ago)

Author:

gkronber

Message:

Fixed #694 (GridExecuter throws exceptions while no job can be started).

File:

• trunk/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs

@@ -53 +53 @@
     }
 
+    private TimeSpan WaitForNewJobsInterval {
+      get { return TimeSpan.FromSeconds(3); }
+    }
+
     public GridExecuter(IDispatcher dispatcher, IStore store, IGridServer server)
       : base(dispatcher, store) {
@@ -83 +87 @@
             }
           }
-          WaitHandle[] whArr = asyncResults.Keys.ToArray();
-          int readyHandleIndex = WaitAny(whArr, WaitForFinishedJobsTimeout);
-          if (readyHandleIndex != WaitHandle.WaitTimeout) {
-            WaitHandle readyHandle = whArr[readyHandleIndex];
-            IAlgorithm finishedAlgorithm = null;
-            AsyncGridResult finishedResult = null;
-            lock (activeAlgorithms) {
-              finishedResult = asyncResults[readyHandle];
-              finishedAlgorithm = activeAlgorithms[finishedResult];
-              activeAlgorithms.Remove(finishedResult);
-              asyncResults.Remove(readyHandle);
+          if (asyncResults.Count > 0) {
+            WaitHandle[] whArr = asyncResults.Keys.ToArray();
+            int readyHandleIndex = WaitAny(whArr, WaitForFinishedJobsTimeout);
+            if (readyHandleIndex != WaitHandle.WaitTimeout) {
+              WaitHandle readyHandle = whArr[readyHandleIndex];
+              IAlgorithm finishedAlgorithm = null;
+              AsyncGridResult finishedResult = null;
+              lock (activeAlgorithms) {
+                finishedResult = asyncResults[readyHandle];
+                finishedAlgorithm = activeAlgorithms[finishedResult];
+                activeAlgorithms.Remove(finishedResult);
+                asyncResults.Remove(readyHandle);
+              }
+              OnChanged();
+              try {
+                IEngine finishedEngine = jobManager.EndExecuteEngine(finishedResult);
+                SetResults(finishedEngine.GlobalScope, finishedAlgorithm.Engine.GlobalScope);
+                StoreResults(finishedAlgorithm);
+              }
+              catch (Exception badEx) {
+                HeuristicLab.Tracing.Logger.Error("CEDMA Executer: Exception in job execution thread. " + badEx.Message);
+              }
             }
-            OnChanged();
-            try {
-              IEngine finishedEngine = jobManager.EndExecuteEngine(finishedResult);
-              SetResults(finishedEngine.GlobalScope, finishedAlgorithm.Engine.GlobalScope);
-              StoreResults(finishedAlgorithm);
-            }
-            catch (Exception badEx) {
-              HeuristicLab.Tracing.Logger.Error("CEDMA Executer: Exception in job execution thread. " + badEx.Message);
-            }
+          } else {
+            Thread.Sleep(WaitForNewJobsInterval);
           }
         }
+
         catch (Exception ex) {
           HeuristicLab.Tracing.Logger.Warn("CEDMA Executer: Exception in job-management thread. " + ex.Message);
@@ -112 +121 @@
     }
 
-        // wait until any job is finished
+    // wait until any job is finished
     private int WaitAny(WaitHandle[] wh, TimeSpan WaitForFinishedJobsTimeout) {
       if (wh.Length <= 64) {