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

libstore: simplify Worker::waitForInput

Browse source 
with waitForAWhile turned into promised the core functionality of
waitForInput is now merely to let gc run every so often if needed

Change-Id: I68da342bbc1d67653901cf4502dabfa5bc947628
This commit is contained in:
eldritch horrors 2024-09-01 01:37:10 +02:00
parent cd1ceffb0e
commit bf32085d63
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libstore/build/worker.cc
View file

@ -438,38 +438,17 @@ void Worker::waitForInput()
{ {
printMsg(lvlVomit, "waiting for children"); printMsg(lvlVomit, "waiting for children");
auto childFinished = [&]{ auto waitFor = [&]{
auto pair = kj::newPromiseAndFulfiller<void>(); auto pair = kj::newPromiseAndFulfiller<void>();
this->childFinished = kj::mv(pair.fulfiller); this->childFinished = kj::mv(pair.fulfiller);
return kj::mv(pair.promise); return kj::mv(pair.promise);
}(); }();
/* Process output from the file descriptors attached to the
children, namely log output and output path creation commands.
We also use this to detect child termination: if we get EOF on
the logger pipe of a build, we assume that the builder has
terminated. */
std::optional<long> timeout = 0;
// Periodicallty wake up to see if we need to run the garbage collector.
if (settings.minFree.get() != 0) { if (settings.minFree.get() != 0) {
timeout = 10; // Periodicallty wake up to see if we need to run the garbage collector.
waitFor = waitFor.exclusiveJoin(aio.provider->getTimer().afterDelay(10 * kj::SECONDS));
} }
if (timeout)
vomit("sleeping %d seconds", *timeout);
auto waitFor = [&] {
if (timeout) {
return aio.provider->getTimer()
.afterDelay(*timeout * kj::SECONDS)
.exclusiveJoin(kj::mv(childFinished));
} else {
return std::move(childFinished);
}
}();
waitFor.wait(aio.waitScope); waitFor.wait(aio.waitScope);
} }