From 20f53346df1e0150e4cbfd1b07023e511c277546 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sat, 20 Jul 2024 21:05:19 +0200 Subject: [PATCH] libstore: remove unused Worker::waitForAnyGoal Change-Id: Ia3ebd434b17052b6760ce74d8e20025a72148613 --- src/libstore/build/worker.cc | 15 --------------- src/libstore/build/worker.hh | 11 ----------- 2 files changed, 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 @@ -90,11 +90,6 @@ private: std::map> substitutionGoals; std::map> drvOutputSubstitutionGoals; - /** - * Goals waiting for busy paths to be unlocked. - */ - WeakGoals waitingForAnyGoal; - /** * Goals sleeping for a few seconds (polling a lock). */ @@ -241,12 +236,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