maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Substitutes should occupy a build slot.

Browse source
This commit is contained in:
Eelco Dolstra 2004-06-22 09:00:31 +00:00
parent c4cb6ea2bc
commit 155d7c8dfa
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/normalise.cc
View file

@ -1218,6 +1218,7 @@ public:
void tryNext();
void exprNormalised();
void exprRealised();
void tryToRun();
void finished();
};
@ -1302,6 +1303,19 @@ void SubstitutionGoal::exprRealised()
{
debug(format("store expr realised of `%1%'") % storePath);
state = &SubstitutionGoal::tryToRun;
worker.waitForBuildSlot(shared_from_this());
}
void SubstitutionGoal::tryToRun()
{
/* Make sure that we are allowed to start a build. */
if (!worker.canBuildMore()) {
worker.waitForBuildSlot(shared_from_this());
return;
}
/* What's the substitute program? */
StoreExpr expr = storeExprFromPath(nfSub);
assert(expr.type == StoreExpr::neClosure);
@ -1390,7 +1404,7 @@ void SubstitutionGoal::exprRealised()
/* parent */
logPipe.writeSide.close();
worker.childStarted(shared_from_this(),
pid, logPipe.readSide, false);
pid, logPipe.readSide, true);
state = &SubstitutionGoal::finished;
}