Skip to content
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

Cleanups for condition_variable's waiting functions #3974

Merged
merged 9 commits into from
Sep 21, 2023
Merged

Cleanups for condition_variable's waiting functions #3974

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3afc9f7
nitpick
achabense Aug 17, 2023
764d62e
merge `_Wait_until1`
achabense Aug 17, 2023
bcb4543
fix and simplify `wait_until(lock,abs_time,pred)`
achabense Aug 17, 2023
8ecbc2a
simplify `wait_for(lock,rel_time)`, now all the correctness rely on `…
achabense Aug 17, 2023
67111c0
merge `_Wait_until_sys_time` and add `TRANSITION` comment.
achabense Aug 17, 2023
2ddb7b9
Apply suggestions from code review
achabense Sep 16, 2023
6673cc1
format
achabense Sep 16, 2023
bf642d0
Apply suggestions from code review: restore fast branch for wait_for
achabense Sep 16, 2023
5f3c0d6
Fix Casey's suggestion typo
CaseyCarter Sep 18, 2023
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
15 changes: 1 addition & 14 deletions stl/inc/mutex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,20 +573,7 @@ public:
template <class _Rep, class _Period>
cv_status wait_for(unique_lock<mutex>& _Lck, const chrono::duration<_Rep, _Period>& _Rel_time) {
// wait for duration
if (_Rel_time <= chrono::duration<_Rep, _Period>::zero()) {
return cv_status::timeout;
}

// TRANSITION, ABI: The standard says that we should use a steady clock,
// but unfortunately our ABI relies on the system clock.
_timespec64 _Tgt;
const bool _Clamped = _To_timespec64_sys_10_day_clamped(_Tgt, _Rel_time);
const cv_status _Result = _Wait_until_sys_time(_Lck, &_Tgt);
if (_Clamped) {
return cv_status::no_timeout;
}

return _Result;
return wait_until(_Lck, _To_absolute_time(_Rel_time));
}
achabense marked this conversation as resolved.
Show resolved Hide resolved

template <class _Rep, class _Period, class _Predicate>
Expand Down