Changeset 15065 for branches/Async/HeuristicLab.DebugEngine/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.DebugEngine/3.3/DebugEngine.cs (modified) (5 diffs)

branches/Async/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -161 +160 @@
         while (skipStackOperations && !(CurrentOperation is IAtomicOperation) && CanContinue)
           ProcessNextOperation(true, cancellationTokenSource.Token);
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         OnExceptionOccurred(ex);
       }
@@ -174 +172 @@
     }
 
-    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 (stopPending || !CanContinue) OnStopped();
-          else OnPaused();
-        });
-      }
-    }
-
+
+      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;
+      if (stopPending) ExecutionStack.Clear();
+      if (stopPending || !CanContinue) OnStopped();
+      else OnPaused();
+    }
     protected override void OnStarted() {
       Log.LogMessage("Engine started");
@@ -252 +242 @@
           ProcessNextOperation(false, cancellationToken);
         cancellationToken.ThrowIfCancellationRequested();
-      }
-      finally {
+      } finally {
         timer.Stop();
         ExecutionTime += DateTime.UtcNow - lastUpdateTime;
@@ -319 +308 @@
           }
           CurrentOperation = null;
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
           if (ex is OperationCanceledException) throw ex;
           else throw new OperatorExecutionException(operation.Operator, ex);