Changeset 8170 for trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

Timestamp:

06/30/12 18:09:56 (12 years ago)

Author:

gkronber

Message:

#1878: added synchronization to all event handlers for optimizer events in the Experiment

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -326 +326 @@
       optimizer.Runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<IRun>(optimizer_Runs_ItemsRemoved);
     }
+
+    private readonly object locker = new object();
     private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
-      OnExceptionOccurred(e.Value);
+      lock (locker)
+        OnExceptionOccurred(e.Value);
     }
     private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
-      ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
+      lock (locker)
+        ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
     }
     private void optimizer_Paused(object sender, EventArgs e) {
-      if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
+      lock (locker)
+        if (Optimizers.All(x => x.ExecutionState != ExecutionState.Started)) OnPaused();
     }
     private void optimizer_Prepared(object sender, EventArgs e) {
-      if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
+      lock (locker)
+        if (Optimizers.All(x => x.ExecutionState == ExecutionState.Prepared)) OnPrepared();
     }
     private void optimizer_Started(object sender, EventArgs e) {
-      if (ExecutionState != ExecutionState.Started) OnStarted();
-    }
-
-    private readonly object locker = new object();
+      lock (locker)
+        if (ExecutionState != ExecutionState.Started) OnStarted();
+    }
     private void optimizer_Stopped(object sender, EventArgs e) {
       lock (locker) {
@@ -356 +361 @@
     }
     private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      Runs.RemoveRange(e.OldItems);
-      Runs.AddRange(e.Items);
+      lock (locker) {
+        Runs.RemoveRange(e.OldItems);
+        Runs.AddRange(e.Items);
+      }
     }
     private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      Runs.AddRange(e.Items);
+      lock (locker)
+        Runs.AddRange(e.Items);
     }
     private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      Runs.RemoveRange(e.Items);
+      lock (locker)
+        Runs.RemoveRange(e.Items);
     }