Changed how canceled tasks are dealt with.

1 files changed, 13 insertions, 6 deletions

diff --git a/Source/ExecutionEngine/ExecutionEngine.cs b/Source/ExecutionEngine/ExecutionEngine.cs
index dedb3981..05c4b44b 100644
--- a/Source/ExecutionEngine/ExecutionEngine.cs
+++ b/Source/ExecutionEngine/ExecutionEngine.cs
@@ -944,12 +944,22 @@ namespace Microsoft.Boogie
           }

 

           // Execute the tasks.

-          for (int i = 0; i < stablePrioritizedImpls.Length && outcome != PipelineOutcome.FatalError; i++)

+          int j = 0;

+          for (; j < stablePrioritizedImpls.Length && outcome != PipelineOutcome.FatalError; j++)

           {

-              semaphore.Wait(cts.Token);

-              tasks[i].Start(TaskScheduler.Default);

+              try

+              {

+                  semaphore.Wait(cts.Token);

+              }

+              catch (OperationCanceledException)

+              {                  

+                  break;

+              }

+              tasks[j].Start(TaskScheduler.Default);

           }

 

+          // Don't wait for tasks that haven't been started yet.

+          tasks = tasks.Take(j).ToArray();

           Task.WaitAll(tasks);

       }

       catch (AggregateException ae)

@@ -971,9 +981,6 @@ namespace Microsoft.Boogie
               return false;

           });

       }

-      catch (OperationCanceledException)

-      {

-      }

       finally

       {

         CleanupCheckers(requestId);