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

DerivationBuildingGoal::outputLocks make local variable

Browse source
This commit is contained in:
John Ericson 2025-08-29 15:08:35 -04:00
parent a63ac8d98b
commit 3b9c510ab1
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -475,6 +475,11 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
*/ */
std::unique_ptr<Activity> actLock; std::unique_ptr<Activity> actLock;
/**
* Locks on (fixed) output paths.
*/
PathLocks outputLocks;
bool useHook; bool useHook;
while (true) { while (true) {
@ -1301,7 +1306,6 @@ SingleDrvOutputs DerivationBuildingGoal::assertPathValidity()
Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs) Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs)
{ {
outputLocks.unlock();
buildResult.status = status; buildResult.status = status;
assert(buildResult.success()); assert(buildResult.success());
@ -1319,7 +1323,6 @@ Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, Singl
Goal::Done DerivationBuildingGoal::doneFailure(BuildError ex) Goal::Done DerivationBuildingGoal::doneFailure(BuildError ex)
{ {
outputLocks.unlock();
buildResult.status = ex.status; buildResult.status = ex.status;
buildResult.errorMsg = fmt("%s", Uncolored(ex.info().msg)); buildResult.errorMsg = fmt("%s", Uncolored(ex.info().msg));
if (buildResult.status == BuildResult::TimedOut) if (buildResult.status == BuildResult::TimedOut)

5
src/libstore/include/nix/store/build/derivation-building-goal.hh
View file

@ -43,11 +43,6 @@ struct DerivationBuildingGoal : public Goal
* The remainder is state held during the build. * The remainder is state held during the build.
*/ */
/**
* Locks on (fixed) output paths.
*/
PathLocks outputLocks;
/** /**
* All input paths (that is, the union of FS closures of the * All input paths (that is, the union of FS closures of the
* immediate input paths). * immediate input paths).