Changeset 13050 for stable/HeuristicLab.Optimization

Timestamp:

10/22/15 19:03:59 (9 years ago)

Author:

gkronber

Message:

#2061: merged r13000 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (5 diffs)

stable/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -345 +346 @@
 
     private readonly object locker = new object();
+    private readonly object runsLocker = new object();
     private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       lock (locker)
@@ -350 +352 @@
     }
     private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
-      lock (locker)
+      // 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;
+      try {
         ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      }
+      finally {
+        Monitor.Exit(locker);
+      }
     }
     private void optimizer_Paused(object sender, EventArgs e) {
@@ -378 +387 @@
     }
     private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      lock (locker) {
+      lock (runsLocker) {
         Runs.RemoveRange(e.OldItems);
         Runs.AddRange(e.Items);
@@ -384 +393 @@
     }
     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);
     }