Changeset 15065 for branches/Async/HeuristicLab.Core/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

Location:

branches/Async/HeuristicLab.Core/3.3

Files:

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

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -82 +81 @@
     }
 
-    public override async Task StartAsync(CancellationToken cancellationToken) {
-      await base.StartAsync(cancellationToken);
-      cancellationTokenSource = new CancellationTokenSource();
+    public override void Start(CancellationToken cancellationToken) {
+      base.Start(cancellationToken);
+      cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
       stopPending = false;
-      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;
-          if (stopPending) executionStack.Clear();
-          if (executionStack.Count == 0) OnStopped();
-          else OnPaused();
-        });
+
+      try {
+        Run((object)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;
+      if (stopPending) executionStack.Clear();
+      if (executionStack.Count == 0) OnStopped();
+      else OnPaused();
     }
     protected override void OnStarted() {
@@ -154 +147 @@
       try {
         Run(cancellationToken);
-      }
-      finally {
+      } finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();

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

@@ -84 +84 @@
       ExecutionTime = TimeSpan.Zero;
     }
-    public void Start() {
-      StartAsync().Wait();
+    public virtual void Start() {
+      Start(CancellationToken.None);
     }
-    public async Task StartAsync() {
-      await StartAsync(CancellationToken.None);
-    }
-    public virtual async Task StartAsync(CancellationToken cancellationToken) {
+    public virtual void Start(CancellationToken cancellationToken) {
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused))
         throw new InvalidOperationException(string.Format("Start not allowed in execution state \"{0}\".", ExecutionState));
+    }
+    public virtual async Task StartAsync() { await StartAsync(CancellationToken.None); }
+    public virtual async Task StartAsync(CancellationToken cancellationToken) {
+      await Task.Factory.StartNew((ct) => Start((CancellationToken)ct), cancellationToken, cancellationToken);
     }
     public virtual void Pause() {

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

@@ -32 +32 @@
     void Prepare();
     void Start();
+    void Start(CancellationToken cancellationToken);
     Task StartAsync();
     Task StartAsync(CancellationToken cancellationToken);