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

Fix abort when the GC thread gets an exception

Browse source
This commit is contained in:
Eelco Dolstra 2017-09-06 11:37:58 +02:00
parent 0b606aad46
commit 1277aab219
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/libstore/gc.cc
View file

@ -887,24 +887,32 @@ void LocalStore::autoGC(bool sync)
std::thread([promise{std::move(promise)}, this, avail, getAvail]() mutable {
/* Wake up any threads waiting for the auto-GC to finish. */
Finally wakeup([&]() {
auto state(_state.lock());
state->gcRunning = false;
state->lastGCCheck = std::chrono::steady_clock::now();
promise.set_value();
});
try {
printInfo("running auto-GC to free %d bytes", settings.maxFree - avail);
/* Wake up any threads waiting for the auto-GC to finish. */
Finally wakeup([&]() {
auto state(_state.lock());
state->gcRunning = false;
state->lastGCCheck = std::chrono::steady_clock::now();
promise.set_value();
});
GCOptions options;
options.maxFreed = settings.maxFree - avail;
printInfo("running auto-GC to free %d bytes", settings.maxFree - avail);
GCResults results;
GCOptions options;
options.maxFreed = settings.maxFree - avail;
collectGarbage(options, results);
GCResults results;
_state.lock()->availAfterGC = getAvail();
collectGarbage(options, results);
_state.lock()->availAfterGC = getAvail();
} catch (...) {
// FIXME: we could propagate the exception to the
// future, but we don't really care.
ignoreException();
}
}).detach();
}