Skip to content

fix: Fix writing into dead variables in BlockingCache #2333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuznetsss merged 4 commits into from
Jul 21, 2025
Merged

fix: Fix writing into dead variables in BlockingCache #2333

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e09c65e
fix: Add shared state to BlockingCache
kuznetsss Jul 15, 2025
c04f0c7
Merge branch 'develop' into Fix_blocking_cache_bug
kuznetsss Jul 16, 2025
a052ca8
Merge branch 'develop' into Fix_blocking_cache_bug
kuznetsss Jul 17, 2025
eadb8f3
Merge branch 'develop' into Fix_blocking_cache_bug
kuznetsss Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/util/BlockingCache.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,22 +197,31 @@ class BlockingCache {
std::expected<ValueType, ErrorType>
wait(boost::asio::yield_context yield, Updater updater, Verifier verifier)
{
boost::asio::steady_timer timer{yield.get_executor(), boost::asio::steady_timer::duration::max()};
struct SharedContext {
SharedContext(boost::asio::yield_context y)
: timer(y.get_executor(), boost::asio::steady_timer::duration::max())
{
}

boost::asio::steady_timer timer;
std::optional<std::expected<ValueType, ErrorType>> result;
};

auto sharedContext = std::make_shared<SharedContext>(yield);
boost::system::error_code errorCode;

std::optional<std::expected<ValueType, ErrorType>> result;
boost::signals2::scoped_connection const slot =
updateFinished_.connect([yield, &timer, &result](std::expected<ValueType, ErrorType> value) {
boost::asio::spawn(yield, [&timer, &result, value = std::move(value)](auto&&) {
result = std::move(value);
timer.cancel();
updateFinished_.connect([yield, sharedContext](std::expected<ValueType, ErrorType> value) {
boost::asio::spawn(yield, [sharedContext = std::move(sharedContext), value = std::move(value)](auto&&) {
sharedContext->result = std::move(value);
sharedContext->timer.cancel();
});
});

if (state_ == State::Updating) {
timer.async_wait(yield[errorCode]);
ASSERT(result.has_value(), "There should be some value after waiting");
return std::move(result).value();
sharedContext->timer.async_wait(yield[errorCode]);
ASSERT(sharedContext->result.has_value(), "There should be some value after waiting");
return std::move(sharedContext->result).value();
}
return asyncGet(yield, std::move(updater), std::move(verifier));
}
Expand Down