nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 11:36:03 +01:00
Code Activity

Merge pull request #14310 from obsidiansystems/inline-drv-output-subst-goal

Browse source 
Inline `realisationFetched`
This commit is contained in:
John Ericson 2025-10-21 06:03:06 +00:00 • committed by GitHub
commit ada008a795
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/libstore/build/drv-output-substitution-goal.cc
View file

@ -112,7 +112,21 @@ Goal::Co DrvOutputSubstitutionGoal::init()
if (failed)
continue;
co_return realisationFetched(std::move(waitees), outputInfo, sub);
waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
co_await await(std::move(waitees));
trace("output path substituted");
if (nrFailed > 0) {
debug("The output path of the derivation output '%s' could not be substituted", id.to_string());
co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed);
}
worker.store.registerDrvOutput({*outputInfo, id});
trace("finished");
co_return amDone(ecSuccess);
}
/* None left. Terminate this goal and let someone else deal
@ -130,26 +144,6 @@ Goal::Co DrvOutputSubstitutionGoal::init()
co_return amDone(substituterFailed ? ecFailed : ecNoSubstituters);
}
Goal::Co DrvOutputSubstitutionGoal::realisationFetched(
Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub)
{
waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
co_await await(std::move(waitees));
trace("output path substituted");
if (nrFailed > 0) {
debug("The output path of the derivation output '%s' could not be substituted", id.to_string());
co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed);
}
worker.store.registerDrvOutput({*outputInfo, id});
trace("finished");
co_return amDone(ecSuccess);
}
std::string DrvOutputSubstitutionGoal::key()
{
return "a$" + std::string(id.to_string());

2
src/libstore/include/nix/store/build/drv-output-substitution-goal.hh
View file

@ -32,8 +32,6 @@ public:
DrvOutputSubstitutionGoal(const DrvOutput & id, Worker & worker);
Co init();
Co
realisationFetched(Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub);
void timedOut(Error && ex) override
{