nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-14 04:51:05 +01:00
Code Activity

DerivationBuilder no more callback soup for logging

Browse source 
`startBuilder` just returns the descriptor for the pipe now.
This commit is contained in:
John Ericson 2025-09-03 17:33:48 -04:00
parent 7f3314a68c
commit 14c206f05a
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/build/derivation-building-goal.cc
View file

@ -716,11 +716,6 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
~DerivationBuildingGoalCallbacks() override = default;
void childStarted(Descriptor builderOut) override
{
goal.worker.childStarted(goal.shared_from_this(), {builderOut}, true, true);
}
void childTerminated() override
{
goal.worker.childTerminated(&goal);
@ -802,10 +797,11 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
actLock.reset();
Descriptor builderOut;
try {
/* Okay, we have to build. */
builder->startBuilder();
builderOut = builder->startBuilder();
} catch (BuildError & e) {
builder.reset();
@ -814,6 +810,8 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
co_return doneFailure(std::move(e)); // InputRejected
}
worker.childStarted(shared_from_this(), {builderOut}, true, true);
started();
co_await Suspend{};