Ticket #2061: asynchronouscontentview.patch

HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.cs

@@ -52 +52 @@
     protected new void Invoke(Delegate method, params object[] args) {
       // prevents blocking of worker thread in Invoke, if the control is disposed
       IAsyncResult result = BeginInvoke(method, args);
-      result.AsyncWaitHandle.WaitOne(1000, false);
+      result.AsyncWaitHandle.WaitOne(10, false);
       if (result.IsCompleted) try { EndInvoke(result); }
         catch (ObjectDisposedException) { } else {
         ThreadPool.RegisterWaitForSingleObject(result.AsyncWaitHandle,

HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -179 +180 @@
       experimentStopped = false;
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started)) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Prepare(clearRuns); } catch (InvalidOperationException) { }
+        try { optimizer.Prepare(clearRuns); }
+        catch (InvalidOperationException) { }
       }
     }
     public void Start() {
@@ -192 +194 @@
       IOptimizer optimizer = Optimizers.FirstOrDefault(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused));
       if (optimizer != null) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Start(); } catch (InvalidOperationException) { }
+        try { optimizer.Start(); }
+        catch (InvalidOperationException) { }
       }
     }
     public void Pause() {
@@ -204 +207 @@
       experimentStopped = false;
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState == ExecutionState.Started)) {
         // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-        try { optimizer.Pause(); } catch (InvalidOperationException) { }
+        try { optimizer.Pause(); }
+        catch (InvalidOperationException) { }
       }
     }
     public void Stop() {
@@ -217 +221 @@
       if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) {
         foreach (var optimizer in Optimizers.Where(x => (x.ExecutionState == ExecutionState.Started) || (x.ExecutionState == ExecutionState.Paused))) {
           // a race-condition may occur when the optimizer has changed the state by itself in the meantime
-          try { optimizer.Stop(); } catch (InvalidOperationException) { }
+          try { optimizer.Stop(); }
+          catch (InvalidOperationException) { }
         }
       } else {
         OnStopped();
@@ -340 +345 @@
     }
 
     private readonly object locker = new object();
+    private readonly object runsLocker = new object();
     private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       lock (locker)
         OnExceptionOccurred(e.Value);
     }
     private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
-      lock (locker)
-        ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      // only wait for maximally 100ms to acquire lock, otherwise return and don't update the execution time
+      var success = Monitor.TryEnter(locker, 100);
+      if (!success) return;
+      ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      Monitor.Exit(locker);
     }
     private void optimizer_Paused(object sender, EventArgs e) {
       lock (locker)
@@ -357 +366 @@
         if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
     }
     private void optimizer_Started(object sender, EventArgs e) {
+      if (ExecutionState == ExecutionState.Started) return;
       lock (locker)
         if (ExecutionState != ExecutionState.Started) OnStarted();
     }
@@ -373 +383 @@
       }
     }
     private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker) {
+      lock (runsLocker) {
         Runs.RemoveRange(e.OldItems);
         Runs.AddRange(e.Items);
       }
     }
     private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker)
+      lock (runsLocker)
         Runs.AddRange(e.Items);
     }
+
     private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker)
+      lock (runsLocker)
         Runs.RemoveRange(e.Items);
     }