Skip to content

Avoid reading promise vector size during cancellation #3273

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

Open
dajiaohuang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid reading promise vector size during cancellation #3273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions cpp/async/impl/multiple_promises.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ struct multiple_promises_state_t

explicit multiple_promises_state_t(std::vector<promise<T>>&& promises)
: promises_(std::move(promises))
, promise_count_(promises_.size())
, results_(promises_.size())
, completed_count_(0)
{
}

multiple_promises_state_t(multiple_promises_state_t&& other) noexcept
: promises_(std::move(other.promises_))
, promise_count_(other.promise_count_)
, results_(std::move(other.results_))
, completed_count_(other.completed_count_.load())
{
}

std::vector<promise<T>> promises_;
const std::size_t promise_count_;
results_t results_;
std::atomic<std::size_t> completed_count_;
};
Expand All @@ -38,17 +41,20 @@ struct multiple_promises_state_t<void>

explicit multiple_promises_state_t(std::vector<promise<void>>&& promises)
: promises_(std::move(promises))
, promise_count_(promises_.size())
, completed_count_(0)
{
}

multiple_promises_state_t(multiple_promises_state_t&& other) noexcept
: promises_(std::move(other.promises_))
, promise_count_(other.promise_count_)
, completed_count_(other.completed_count_.load())
{
}

std::vector<promise<void>> promises_;
const std::size_t promise_count_;
std::atomic<std::size_t> completed_count_;
};

Expand Down Expand Up @@ -138,8 +144,8 @@ class multiple_promises
base_t::state().results_[id] = std::move(r.get());
}
const auto completed_count = ++base_t::state().completed_count_;
ASSERT(completed_count <= promises().size());
if (completed_count == promises().size()) {
ASSERT(completed_count <= base_t::state().promise_count_);
if (completed_count == base_t::state().promise_count_) {
if constexpr (std::is_void_v<T>) {
base_t::set_value();
} else {
Expand Down