Changeset 13349 for branches/Async/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

Timestamp:

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

Author:

jkarder

Message:

#2258: added StartAsync to IExecutable

File:

• branches/Async/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (2 diffs)

branches/Async/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -61 +61 @@
     }
 
-    public override void Start() {
-      base.Start();
+    public override async Task StartAsync(CancellationToken cancellationToken) {
+      await base.StartAsync(cancellationToken);
       CancellationTokenSource = new CancellationTokenSource();
 
       OnStarted();
-      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);
-          } catch (AggregateException remaining) {
-            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
-            else OnExceptionOccurred(remaining);
+            t.Wait();
           }
-        }
-        CancellationTokenSource.Dispose();
-        CancellationTokenSource = null;
-        OnStopped();
-      });
+          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;
+          OnStopped();
+        });
+      }
     }
 
@@ -106 +110 @@
       try {
         Run(cancellationToken);
-      } finally {
+      }
+      finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();