wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Delay constructing a DerivationBuilder until we're about to build

Browse source 
This makes the simplification in the following commit possible.
This commit is contained in:
John Ericson 2025-04-18 12:13:06 -04:00
parent 27907e6cac
commit 2b2ea218d9
1 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -41,38 +41,12 @@ struct LocalDerivationGoal : DerivationGoal, DerivationBuilderCallbacks
const OutputsSpec & wantedOutputs, Worker & worker,
BuildMode buildMode)
: DerivationGoal{drvPath, wantedOutputs, worker, buildMode}
, builder{makeDerivationBuilder(
worker.store,
static_cast<DerivationBuilderCallbacks &>(*this),
DerivationBuilderParams {
DerivationGoal::drvPath,
DerivationGoal::buildMode,
DerivationGoal::buildResult,
DerivationGoal::drv,
DerivationGoal::parsedDrv,
DerivationGoal::drvOptions,
DerivationGoal::inputPaths,
DerivationGoal::initialOutputs,
})}
{}
LocalDerivationGoal(const StorePath & drvPath, const BasicDerivation & drv,
const OutputsSpec & wantedOutputs, Worker & worker,
BuildMode buildMode = bmNormal)
: DerivationGoal{drvPath, drv, wantedOutputs, worker, buildMode}
, builder{makeDerivationBuilder(
worker.store,
static_cast<DerivationBuilderCallbacks &>(*this),
DerivationBuilderParams {
DerivationGoal::drvPath,
DerivationGoal::buildMode,
DerivationGoal::buildResult,
DerivationGoal::drv,
DerivationGoal::parsedDrv,
DerivationGoal::drvOptions,
DerivationGoal::inputPaths,
DerivationGoal::initialOutputs,
})}
{}
virtual ~LocalDerivationGoal() override;
@ -136,15 +110,19 @@ LocalDerivationGoal::~LocalDerivationGoal()
{
/* Careful: we should never ever throw an exception from a
destructor. */
try { builder->deleteTmpDir(false); } catch (...) { ignoreExceptionInDestructor(); }
if (builder) {
try { builder->deleteTmpDir(false); } catch (...) { ignoreExceptionInDestructor(); }
}
try { killChild(); } catch (...) { ignoreExceptionInDestructor(); }
try { builder->stopDaemon(); } catch (...) { ignoreExceptionInDestructor(); }
if (builder) {
try { builder->stopDaemon(); } catch (...) { ignoreExceptionInDestructor(); }
}
}
void LocalDerivationGoal::killChild()
{
if (builder->pid != -1) {
if (builder && builder->pid != -1) {
worker.childTerminated(this);
/* If we're using a build user, then there is a tricky race
@ -165,6 +143,7 @@ void LocalDerivationGoal::killChild()
void LocalDerivationGoal::childStarted()
{
assert(builder);
worker.childStarted(shared_from_this(), {builder->builderOut.get()}, true, true);
}
@ -202,6 +181,24 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
co_return tryToBuild();
}
if (!builder) {
/* If we have to wait and retry (see below), then `builder` will
already be created, so we don't need to create it again. */
builder = makeDerivationBuilder(
worker.store,
static_cast<DerivationBuilderCallbacks &>(*this),
DerivationBuilderParams {
DerivationGoal::drvPath,
DerivationGoal::buildMode,
DerivationGoal::buildResult,
DerivationGoal::drv,
DerivationGoal::parsedDrv,
DerivationGoal::drvOptions,
DerivationGoal::inputPaths,
DerivationGoal::initialOutputs,
});
}
if (!builder->prepareBuild()) {
if (!actLock)
actLock = std::make_unique<Activity>(*logger, lvlWarn, actBuildWaiting,
@ -251,7 +248,7 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
bool LocalDerivationGoal::isReadDesc(int fd)
{
return (hook && DerivationGoal::isReadDesc(fd)) ||
(!hook && fd == builder->builderOut.get());
(!hook && builder && fd == builder->builderOut.get());
}
}