Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12747 from obsidiansystems/more-goal-waitForAWhile

Browse Source 
Use `Goal::waitForAWhile` in a few more places
This commit is contained in:
mergify[bot]
2025-03-24 17:28:20 +00:00
committed by GitHub
parent 07321575ca 3cb38e8ab9
commit 5a4e306cc5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libstore/build/derivation-goal.cc
View File

@@ -660,9 +660,8 @@ Goal::Co DerivationGoal::tryToBuild()
if (!actLock)
actLock = std::make_unique<Activity>(*logger, lvlWarn, actBuildWaiting,
fmt("waiting for a machine to build '%s'", Magenta(worker.store.printStorePath(drvPath))));
worker.waitForAWhile(shared_from_this());
outputLocks.unlock();
co_await Suspend{};
co_await waitForAWhile();
co_return tryToBuild();
case rpDecline:
/* We should do it ourselves. */

6
src/libstore/unix/build/local-derivation-goal.cc
View File

@@ -479,9 +479,8 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
unsigned int curBuilds = worker.getNrLocalBuilds();
if (curBuilds >= settings.maxBuildJobs) {
worker.waitForBuildSlot(shared_from_this());
outputLocks.unlock();
co_await Suspend{};
co_await waitForBuildSlot();
co_return tryToBuild();
}
@@ -535,8 +534,7 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
if (!actLock)
actLock = std::make_unique<Activity>(*logger, lvlWarn, actBuildWaiting,
fmt("waiting for a free build user ID for '%s'", Magenta(worker.store.printStorePath(drvPath))));
worker.waitForAWhile(shared_from_this());
co_await Suspend{};
co_await waitForAWhile();
co_return tryLocalBuild();
}
}