lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Show when we're blocked waiting for a lock.

Browse source
This commit is contained in:
Eelco Dolstra 2006-06-16 10:13:03 +00:00
parent 588cb0eade
commit c937b73622
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -1066,7 +1066,8 @@ bool DerivationGoal::prepareBuild()
/* Obtain locks on all output paths. The locks are automatically /* Obtain locks on all output paths. The locks are automatically
released when we exit this function or Nix crashes. */ released when we exit this function or Nix crashes. */
/* !!! BUG: this could block, which is not allowed. */ /* !!! BUG: this could block, which is not allowed. */
outputLocks.lockPaths(outputPaths(drv.outputs)); outputLocks.lockPaths(outputPaths(drv.outputs),
(format("waiting for lock on %1%") % showPaths(outputPaths(drv.outputs))).str());
/* Now check again whether the outputs are valid. This is because /* Now check again whether the outputs are valid. This is because
another process may have started building in parallel. After another process may have started building in parallel. After
@ -1715,10 +1716,9 @@ void SubstitutionGoal::tryToRun()
} }
/* Acquire a lock on the output path. */ /* Acquire a lock on the output path. */
PathSet lockPath;
lockPath.insert(storePath);
outputLock = shared_ptr<PathLocks>(new PathLocks); outputLock = shared_ptr<PathLocks>(new PathLocks);
outputLock->lockPaths(lockPath); outputLock->lockPaths(singleton<PathSet>(storePath),
(format("waiting for lock on `%1%'") % storePath).str());
/* Check again whether the path is invalid. */ /* Check again whether the path is invalid. */
if (isValidPath(storePath)) { if (isValidPath(storePath)) {