Changeset 13349 for branches/Async/HeuristicLab.Algorithms.Benchmarks

Timestamp:

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

Author:

jkarder

Message:

#2258: added StartAsync to IExecutable

File:

• branches/Async/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (1 diff)

branches/Async/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -302 +302 @@
     }
     public void Start() {
+      StartAsync().Wait();
+    }
+    public async Task StartAsync() {
+      await StartAsync(new CancellationToken());
+    }
+    public async Task StartAsync(CancellationToken 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);
+            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;
-        OnStopped();
-      });
-    }
-
+
+          cancellationTokenSource.Dispose();
+          cancellationTokenSource = null;
+          OnStopped();
+        });
+      }
+    }
     private void Run(object state) {
       CancellationToken cancellationToken = (CancellationToken)state;