diff options
| -rw-r--r-- | src/libstore/build/worker.cc | 15 | ||||
| -rw-r--r-- | src/libstore/build/worker.hh | 11 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index 39bcd5d92..ea342da3b 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -157,14 +157,6 @@ void Worker::removeGoal(GoalPtr goal) if (goal->exitCode == Goal::ecFailed && !settings.keepGoing) topGoals.clear(); } - - /* Wake up goals waiting for any goal to finish. */ - for (auto & i : waitingForAnyGoal) { - GoalPtr goal = i.lock(); - if (goal) wakeUp(goal); - } - - waitingForAnyGoal.clear(); } @@ -261,13 +253,6 @@ void Worker::waitForBuildSlot(GoalPtr goal) } -void Worker::waitForAnyGoal(GoalPtr goal) -{ - debug("wait for any goal"); - addToWeakGoals(waitingForAnyGoal, goal); -} - - void Worker::waitForAWhile(GoalPtr goal) { debug("wait for a while"); diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index e1d8e5031..fbb5ad6ec 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -91,11 +91,6 @@ private: std::map<DrvOutput, std::weak_ptr<DrvOutputSubstitutionGoal>> drvOutputSubstitutionGoals; /** - * Goals waiting for busy paths to be unlocked. - */ - WeakGoals waitingForAnyGoal; - - /** * Goals sleeping for a few seconds (polling a lock). */ WeakGoals waitingForAWhile; @@ -242,12 +237,6 @@ public: void waitForBuildSlot(GoalPtr goal); /** - * Wait for any goal to finish. Pretty indiscriminate way to - * wait for some resource that some other goal is holding. - */ - void waitForAnyGoal(GoalPtr goal); - - /** * Wait for a few seconds and then retry this goal. Used when * waiting for a lock held by another process. This kind of * polling is inefficient, but POSIX doesn't really provide a way |