Skip to content

Fix race in parallel adjacent_find #816

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
CaseyCarter merged 3 commits into from
May 12, 2020
Merged

Fix race in parallel adjacent_find #816

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6f0e0
Fix race in parallel adjacent_find
CaseyCarter May 9, 2020
23f932c
Consolidate cancel/completion checking
CaseyCarter May 11, 2020
d0c99bf
Revert "Consolidate cancel/completion checking"
CaseyCarter May 11, 2020
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
6 changes: 5 additions & 1 deletion stl/inc/execution
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,8 +1613,12 @@ struct _Static_partitioned_adjacent_find2 {
: _Team{_Count, _Get_chunked_work_chunk_count(_Hw_threads, _Count)}, _Basis{}, _Results{_Last}, _Pred{_Pred_} {}

_Cancellation_status _Process_chunk() {
if (_Results._Complete()) {
return _Cancellation_status::_Canceled;
}

const auto _Key = _Team._Get_next_key();
if (!_Key || _Results._Complete()) {
if (!_Key) {
return _Cancellation_status::_Canceled;
}

Expand Down