Changeset 8129 for trunk/sources/HeuristicLab.Optimization

Timestamp:

06/26/12 15:49:52 (12 years ago)

Author:

mkommend

Message:

#1878: Added lock statement in Experiment.optimizer_Stopped to avoid a race condition.

File:

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

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

@@ -180 +180 @@
       foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started))
         //if (clearRuns || optimizer.ExecutionState != ExecutionState.Prepared)
-          optimizer.Prepare(clearRuns);
+        optimizer.Prepare(clearRuns);
     }
     public void Start() {
@@ -341 +341 @@
       if (ExecutionState != ExecutionState.Started) OnStarted();
     }
+
+    private object locker;
     private void optimizer_Stopped(object sender, EventArgs e) {
-      if (experimentStopped) {
-        if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) OnStopped();
-      } else {
-        if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
-          Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
-        } else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) OnStopped();
-        else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
+      lock (locker) {
+        if (experimentStopped) {
+          if (Optimizers.All(x => (x.ExecutionState == ExecutionState.Stopped) || (x.ExecutionState == ExecutionState.Prepared))) OnStopped();
+        } else {
+          if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
+            Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).Start();
+          } else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) OnStopped();
+          else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();
+        }
       }
     }