Merge pull request #105 from neonichu/do-not-spawn-after-cancellation

Do not execute new processes anymore after cancel
apple · Feb 1, 2017 · 4df9651 · 4df9651
2 parents f456288 + e6e144e
commit 4df9651
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/BuildSystem/LaneBasedExecutionQueue.cpp b/lib/BuildSystem/LaneBasedExecutionQueue.cpp
@@ -209,6 +209,14 @@ class LaneBasedExecutionQueue : public BuildExecutionQueue {
                  ArrayRef<StringRef> commandLine,
                  ArrayRef<std::pair<StringRef,
                                     StringRef>> environment) override {
+    {
+      std::unique_lock<std::mutex> lock(readyJobsMutex);
+      // Do not execute new processes anymore after cancellation.
+      if (cancelled) {
+        return false;
+      }
+    }
+
     // Assign a process handle, which just needs to be unique for as long as we
     // are communicating with the delegate.
     struct BuildExecutionQueueDelegate::ProcessHandle handle;