Changeset 5193 for trunk/sources/HeuristicLab.Core/3.3

Timestamp:

01/03/11 00:46:55 (14 years ago)

Author:

swagner

Message:

Merged ParallelEngine branch back into trunk (#1333)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Engine.cs (modified) (8 diffs)
• HeuristicLab.Core/3.3/Interfaces/IOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -42 +43 @@
     }
 
-    private bool pausePending, stopPending;
+    #region Variables for communication between threads
+    private CancellationTokenSource cancellationTokenSource;
+    private bool stopPending;
     private DateTime lastUpdateTime;
-    private System.Timers.Timer timer;
+    #endregion
 
     [StorableConstructor]
-    protected Engine(bool deserializing)
-      : base(deserializing) {
-      pausePending = stopPending = false;
-      timer = new System.Timers.Timer(100);
-      timer.AutoReset = true;
-      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
-    }
+    protected Engine(bool deserializing) : base(deserializing) { }
     protected Engine(Engine original, Cloner cloner)
       : base(original, cloner) {
@@ -62 +59 @@
       for (int i = contexts.Length - 1; i >= 0; i--)
         executionStack.Push(cloner.Clone(contexts[i]));
-      pausePending = original.pausePending;
-      stopPending = original.stopPending;
-      timer = new System.Timers.Timer(100);
-      timer.AutoReset = true;
-      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
     }
     protected Engine()
@@ -72 +64 @@
       log = new Log();
       executionStack = new Stack<IOperation>();
-      pausePending = stopPending = false;
-      timer = new System.Timers.Timer(100);
-      timer.AutoReset = true;
-      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
     }
 
@@ -97 +85 @@
     public override void Start() {
       base.Start();
-      ThreadPool.QueueUserWorkItem(new WaitCallback(Run), null);
+      cancellationTokenSource = new CancellationTokenSource();
+      stopPending = false;
+      Task task = Task.Factory.StartNew(Run, cancellationTokenSource.Token, cancellationTokenSource.Token);
+      task.ContinueWith(t => {
+        try {
+          t.Wait();
+        }
+        catch (AggregateException ex) {
+          try {
+            ex.Flatten().Handle(x => x is OperationCanceledException);
+          }
+          catch (AggregateException remaining) {
+            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
+            else OnExceptionOccurred(remaining);
+          }
+        }
+        cancellationTokenSource.Dispose();
+        cancellationTokenSource = null;
+        if (stopPending) executionStack.Clear();
+        if (executionStack.Count == 0) OnStopped();
+        else OnPaused();
+      });
     }
     protected override void OnStarted() {
@@ -106 +115 @@
     public override void Pause() {
       base.Pause();
-      pausePending = true;
+      cancellationTokenSource.Cancel();
     }
     protected override void OnPaused() {
@@ -115 +124 @@
     public override void Stop() {
       base.Stop();
-      stopPending = true;
-      if (ExecutionState == ExecutionState.Paused) OnStopped();
+      if (ExecutionState == ExecutionState.Paused) {
+        executionStack.Clear();
+        OnStopped();
+      } else {
+        stopPending = true;
+        cancellationTokenSource.Cancel();
+      }
     }
     protected override void OnStopped() {
@@ -129 +143 @@
 
     private void Run(object state) {
+      CancellationToken cancellationToken = (CancellationToken)state;
+
       OnStarted();
-      pausePending = stopPending = false;
+      lastUpdateTime = DateTime.Now;
+      System.Timers.Timer timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+      timer.Start();
+      try {
+        Run(cancellationToken);
+      }
+      finally {
+        timer.Stop();
+        timer.Dispose();
+        ExecutionTime += DateTime.Now - lastUpdateTime;
+      }
 
-      lastUpdateTime = DateTime.Now;
-      timer.Start();
-      while (!pausePending && !stopPending && (executionStack.Count > 0)) {
-        ProcessNextOperation();
-      }
-      timer.Stop();
-      ExecutionTime += DateTime.Now - lastUpdateTime;
-
-      if (pausePending) OnPaused();
-      else OnStopped();
+      cancellationToken.ThrowIfCancellationRequested();
     }
-
-    protected abstract void ProcessNextOperation();
+    protected abstract void Run(CancellationToken cancellationToken);
 
     private void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 
 namespace HeuristicLab.Core {
   /// <summary>
-  /// Interface to represent an operator (e.g. GreaterThanComparator,...), 
-  /// a basic instruction of an algorithm.
+  /// Interface to represent an operator.
   /// </summary>
   public interface IOperator : IParameterizedNamedItem {
-    /// <summary>
-    /// Gets or sets a boolean value whether the engine should stop here during the run.
-    /// </summary>
     bool Breakpoint { get; set; }
 
-    /// <summary>
-    /// Executes the current instance on the specified <paramref name="scope"/>.
-    /// </summary>
-    /// <param name="scope">The scope where to execute the current instance.</param>
-    /// <returns>The next operation.</returns>
-    IOperation Execute(IExecutionContext context);
-    /// <summary>
-    /// Aborts the current operator.
-    /// </summary>
-    void Abort();
+    IOperation Execute(IExecutionContext context, CancellationToken cancellationToken);
 
-    /// <summary>
-    /// Occurs when the breakpoint flag of the current instance was changed.
-    /// </summary>
-    event EventHandler BreakpointChanged; 
-    /// <summary>
-    /// Occurs when the current instance is executed.
-    /// </summary>
+    event EventHandler BreakpointChanged;
     event EventHandler Executed;
   }