Changeset 15287 for trunk/sources/HeuristicLab.Algorithms.Benchmarks

Timestamp:

07/26/17 15:48:32 (7 years ago)

Author:

jkarder

Message:

#2258: merged Async branch into trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -302 +302 @@
     }
     public void Start() {
-      cancellationTokenSource = new CancellationTokenSource();
+      Start(CancellationToken.None);
+    }
+    public void Start(CancellationToken cancellationToken) {
+      cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
       OnStarted();
-      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;
-        OnStopped();
-      });
+
+      try {
+        Run(cancellationTokenSource.Token);
+      } catch (OperationCanceledException) {
+      } catch (AggregateException ae) {
+        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+      } catch (Exception e) {
+        OnExceptionOccurred(e);
+      }
+
+      cancellationTokenSource.Dispose();
+      cancellationTokenSource = null;
+      OnStopped();
+    }
+    public async Task StartAsync() { await StartAsync(CancellationToken.None); }
+    public async Task StartAsync(CancellationToken cancellationToken) {
+      await AsyncHelper.DoAsync(Start, cancellationToken);
     }
 
@@ -346 +347 @@
         Benchmark.TimeLimit = timelimit;
         Benchmark.Run(cancellationToken, results);
-      }
-      catch (OperationCanceledException) {
-      }
-      finally {
+      } catch (OperationCanceledException) {
+      } finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();