Context Navigation

Changeset 15367 for trunk/sources

Timestamp:

09/18/17 12:18:47 (7 years ago)

Author:

jkarder

Message:

#2830:

the asynchronous calls are now awaited
added extension method to flatten and handle inner exceptions of AggregateExceptions
fixed some catch clauses

Location:

trunk/sources

Files:

r15287	r15367
312	312	} catch (OperationCanceledException) {
313	313	} catch (AggregateException ae) {
314		~~OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae~~);
	314	ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
315	315	} catch (Exception e) {
316	316	OnExceptionOccurred(e);

r15287	r15367
222	222	}
223	223
224		private void startButton_Click(object sender, EventArgs e) {
225		Content.StartAsync();
	224	private async void startButton_Click(object sender, EventArgs e) {
	225	await Content.StartAsync();
226	226	}
227	227	private void pauseButton_Click(object sender, EventArgs e) {

-                      r15287
+                      r15367
       allAlgorithmsFinished = new ManualResetEventSlim(false);
+      var startedTasks = new List<Task>(clonedAlgorithms.Count);
       //start prepared or paused cloned algorithms
       foreach (IAlgorithm clonedAlgorithm in clonedAlgorithms) {
 …
           lock (locker) {
             if (pausePending || stopPending || ExecutionState != ExecutionState.Started) break;
+            clonedAlgorithm.StartAsync(cancellationToken);
+            var task = clonedAlgorithm.StartAsync(cancellationToken);
+            startedTasks.Add(task);
+          }
+        }
 …
       allAlgorithmsFinished.Wait();
+      Task.WaitAll(startedTasks.ToArray()); // to get exceptions not handled within the tasks
+    }

-                      r15287
+                      r15367
     public override void Prepare() { }
     public override void Start() {
+    public override async void Start() {
       Item.Prepare(initialOperation);
       Item.StartAsync();
+      await Item.StartAsync();
+    }

r15287	r15367
96	96	}
97	97
98		public override void Start() {
	98	public override async void Start() {
99	99	if ((Item is Experiment && OptimizerAsExperiment.Optimizers.Count == 0) \|\| // experiment would not fire OnStopped if it has 0 optimizers
100	100	(Item is BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
101	101	OnTaskStopped();
102	102	} else {
103		Item.StartAsync();
	103	await Item.StartAsync();
104	104	}
105	105	}

r15287	r15367
324	324	if (Content != null) Content.StoreAlgorithmInEachRun = storeAlgorithmInEachRunCheckBox.Checked;
325	325	}
326		private void startButton_Click(object sender, EventArgs e) {
327		Content.StartAsync();
	326	private async void startButton_Click(object sender, EventArgs e) {
	327	await Content.StartAsync();
328	328	}
329	329	private void pauseButton_Click(object sender, EventArgs e) {

-                      r15287
+                      r15367
 using System;
-using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 …
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
+        var e = ae.InnerExceptions.SingleOrDefault() ?? ae;
+        ExceptionDispatchInfo.Capture(e).Throw();
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => ExceptionDispatchInfo.Capture(e).Throw());
+      }
+    }

r15287	r15367
132	132	<Compile Include="Constants.cs" />
133	133	<Compile Include="ArrayExtensions.cs" />
	134	<Compile Include="ExceptionExtensions.cs" />
134	135	<Compile Include="Statistics\EmpiricalCumulativeDistributionFunction.cs" />
135	136	<Compile Include="ListExtensions.cs" />

-                      r15287
+                      r15367
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
 …
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
         OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);

r15287	r15367
181	181	} catch (OperationCanceledException) {
182	182	} catch (AggregateException ae) {
183		~~OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae~~);
	183	ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
184	184	} catch (Exception e) {
185	185	OnExceptionOccurred(e);

-                      r15287
+                      r15367
     #region Control events
     protected virtual void startButton_Click(object sender, EventArgs e) {
       Content.StartAsync();
+    protected virtual async void startButton_Click(object sender, EventArgs e) {
+      await Content.StartAsync();
+    }
     protected virtual void pauseButton_Click(object sender, EventArgs e) {

r15302	r15367
84	84	}
85	85	catch (AggregateException ae) {
86		~~OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae~~);
	86	ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
87	87	}
88	88	catch (Exception e) {

Note: See TracChangeset for help on using the changeset viewer.