Changeset 9444 for branches/HivePerformance/sources/HeuristicLab.ParallelEngine

Timestamp:

05/06/13 12:30:18 (12 years ago)

Author:

pfleck

Message:

#2030
Switched Text encoding to Mtom encoding for better performance for binary data.
Merged trunk into branch.

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (2 diffs)

branches/HivePerformance/sources/HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs

@@ -77 +77 @@
       parallelOptions = new ParallelOptions();
       parallelOptions.MaxDegreeOfParallelism = DegreeOfParallelism;
+      parallelOptions.CancellationToken = cancellationToken;
       Run(ExecutionStack);
     }
@@ -101 +102 @@
               Parallel.ForEach(stacks, parallelOptions, Run);
             }
-            catch (AggregateException ex) {
+            catch (OperationCanceledException ex) {
               OperationCollection remaining = new OperationCollection() { Parallel = true };
               for (int i = 0; i < stacks.Length; i++) {