lix-project/lix
20
53
Fork 29
Code Issues 343 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "libstore: always release build/substitution slot tokens" into main

Browse source
This commit is contained in:
eldritch horrors 2024-10-19 18:32:30 +00:00 committed by Gerrit Code Review
parent 60578b4d7d 564d931134
commit b0e619b8bd
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build/goal.cc
View file

@ -22,6 +22,12 @@ kj::Promise<void> Goal::waitForAWhile()
kj::Promise<Result<Goal::WorkResult>> Goal::work() noexcept kj::Promise<Result<Goal::WorkResult>> Goal::work() noexcept
try { try {
// always clear the slot token, no matter what happens. not doing this
// can cause builds to get stuck on exceptions (or other early exist).
// ideally we'd use scoped slot tokens instead of keeping them in some
// goal member variable, but we cannot do this yet for legacy reasons.
KJ_DEFER({ slotToken = {}; });
BOOST_OUTCOME_CO_TRY(auto result, co_await workImpl()); BOOST_OUTCOME_CO_TRY(auto result, co_await workImpl());
trace("done"); trace("done");