Changeset 15065 for branches/Async/HeuristicLab.Algorithms.Benchmarks/3.3

Timestamp:

06/26/17 09:45:36 (7 years ago)

Author:

jkarder

Message:

#2258: refactored async methods

• synchronously called IExecutables are now executed in the caller's thread
• removed old synchronization code from unit tests

File:

• branches/Async/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (2 diffs)

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

@@ -302 +302 @@
     }
     public void Start() {
-      StartAsync().Wait();
-    }
-    public async Task StartAsync() {
-      await StartAsync(CancellationToken.None);
-    }
+      Start(CancellationToken.None);
+    }
+    public void Start(CancellationToken cancellationToken) {
+      cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+      OnStarted();
+
+      try {
+        Run(cancellationTokenSource.Token);
+      } catch (OperationCanceledException) {
+      } catch (AggregateException ae) {
+        if (ae.InnerExceptions.Count == 1) OnExceptionOccurred(ae.InnerExceptions[0]);
+        else OnExceptionOccurred(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) {
-      cancellationTokenSource = new CancellationTokenSource();
-      OnStarted();
-      using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, cancellationToken)) {
-        Task task = Task.Factory.StartNew(Run, cts.Token, cts.Token);
-        await 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();
-        });
-      }
-    }
+      await Task.Factory.StartNew((ct) => Start((CancellationToken)ct), cancellationToken, cancellationToken);
+    }
+
     private void Run(object state) {
       CancellationToken cancellationToken = (CancellationToken)state;
@@ -353 +348 @@
         Benchmark.TimeLimit = timelimit;
         Benchmark.Run(cancellationToken, results);
-      }
-      catch (OperationCanceledException) {
-      }
-      finally {
+      } catch (OperationCanceledException) {
+      } finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();