Changeset 13349 for branches/Async/HeuristicLab.Core/3.3

Timestamp:

11/23/15 21:18:26 (9 years ago)

Author:

jkarder

Message:

#2258: added StartAsync to IExecutable

Location:

branches/Async/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (1 diff)
• Executable.cs (modified) (2 diffs)
• Interfaces/IExecutable.cs (modified) (2 diffs)

branches/Async/HeuristicLab.Core/3.3/Engine.cs

@@ -82 +82 @@
     }
 
-    public override void Start() {
-      base.Start();
+    public override async Task StartAsync(CancellationToken cancellationToken) {
+      await base.StartAsync(cancellationToken);
       cancellationTokenSource = new CancellationTokenSource();
       stopPending = false;
-      Task task = Task.Factory.StartNew(Run, cancellationTokenSource.Token, cancellationTokenSource.Token);
-      task.ContinueWith(t => {
-        try {
-          t.Wait();
-        }
-        catch (AggregateException ex) {
+      using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, cancellationToken)) {
+        Task task = Task.Factory.StartNew(Run, cts.Token, cts.Token);
+        await task.ContinueWith(t => {
           try {
-            ex.Flatten().Handle(x => x is OperationCanceledException);
+            t.Wait();
           }
-          catch (AggregateException remaining) {
-            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
-            else OnExceptionOccurred(remaining);
+          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();
-      });
+          cancellationTokenSource.Dispose();
+          cancellationTokenSource = null;
+          if (stopPending) executionStack.Clear();
+          if (executionStack.Count == 0) OnStopped();
+          else OnPaused();
+        });
+      }
     }
     protected override void OnStarted() {

branches/Async/HeuristicLab.Core/3.3/Executable.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -82 +84 @@
       ExecutionTime = TimeSpan.Zero;
     }
-    public virtual void Start() {
+    public void Start() {
+      StartAsync().Wait();
+    }
+    public async Task StartAsync() {
+      await StartAsync(new CancellationToken());
+    }
+    public virtual async Task StartAsync(CancellationToken cancellationToken) {
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused))
         throw new InvalidOperationException(string.Format("Start not allowed in execution state \"{0}\".", ExecutionState));

branches/Async/HeuristicLab.Core/3.3/Interfaces/IExecutable.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
 
@@ -30 +32 @@
     void Prepare();
     void Start();
+    Task StartAsync();
+    Task StartAsync(CancellationToken cancellationToken);
     void Pause();
     void Stop();