Skip to content

Make this_thread::sleep_until clock-aware #3914

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
StephanTLavavej merged 10 commits into from
Oct 20, 2023
Merged

Make this_thread::sleep_until clock-aware #3914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
919c787
fix
achabense Jul 30, 2023
801fda7
break->return
achabense Jul 31, 2023
0020d4f
review feedack: _Nsec_per_msec->nsec_per_msec
achabense Jul 31, 2023
79cf55a
apply feedback branch
achabense Aug 10, 2023
6a15803
Merge branch 'microsoft:main' into _Thread_sleep_fix2
achabense Aug 10, 2023
33f977a
Merge branch 'main' into _Thread_sleep_fix2
achabense Aug 11, 2023
9a47f8a
style
achabense Aug 16, 2023
6d7e59c
Merge branch '_Thread_sleep_fix2' of https://github.com/achabense/STL…
achabense Aug 16, 2023
09ab20b
style
achabense Aug 17, 2023
489cd7d
Casey's review comments
CaseyCarter Oct 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
13 changes: 10 additions & 3 deletions stl/inc/thread
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,16 @@ namespace this_thread {
return;
}

_timespec64 _Tgt;
(void) _To_timespec64_sys_10_day_clamped(_Tgt, _Abs_time - _Now);
_Thrd_sleep(&_Tgt);
// _Clamp must be less than 2^32 - 1 (INFINITE) milliseconds, but is otherwise arbitrary.
constexpr chrono::milliseconds _Clamp{chrono::hours{24}};

const auto _Rel = _Abs_time - _Now;
if (_Rel >= _Clamp) {
_Thrd_sleep_for(static_cast<unsigned long>(_Clamp.count()));
} else {
const auto _Rel_ms = chrono::ceil<chrono::milliseconds>(_Rel);
_Thrd_sleep_for(static_cast<unsigned long>(_Rel_ms.count()));
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion stl/inc/xthreads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ enum class _Thrd_result : int { _Success, _Nomem, _Timedout, _Busy, _Error };
// threads
_CRTIMP2_PURE _Thrd_result __cdecl _Thrd_detach(_Thrd_t);
_CRTIMP2_PURE _Thrd_result __cdecl _Thrd_join(_Thrd_t, int*);
_CRTIMP2_PURE void __cdecl _Thrd_sleep(const _timespec64*);
_CRTIMP2_PURE void __cdecl _Thrd_yield();
_CRTIMP2_PURE unsigned int __cdecl _Thrd_hardware_concurrency();
_CRTIMP2_PURE _Thrd_id_t __cdecl _Thrd_id();
void __stdcall _Thrd_sleep_for(unsigned long /*ms*/) noexcept;

// mutexes
enum { // mutex types
Expand Down
1 change: 1 addition & 0 deletions stl/src/cthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ _CRTIMP2_PURE _Thrd_result __cdecl _Thrd_detach(_Thrd_t thr) {
return CloseHandle(thr._Hnd) ? _Thrd_result::_Success : _Thrd_result::_Error;
}

// TRANSITION, ABI: _Thrd_sleep() is preserved for binary compatibility
_CRTIMP2_PURE void __cdecl _Thrd_sleep(const _timespec64* xt) { // suspend thread until time xt
_timespec64 now;
_Timespec64_get_sys(&now);
Expand Down
4 changes: 4 additions & 0 deletions stl/src/sharedmutex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,8 @@ void __cdecl _Smtx_unlock_exclusive(_Smtx_t* smtx) { // unlock exclusive shared
void __cdecl _Smtx_unlock_shared(_Smtx_t* smtx) { // unlock non-exclusive shared mutex
ReleaseSRWLockShared(reinterpret_cast<PSRWLOCK>(smtx));
}

void __stdcall _Thrd_sleep_for(const unsigned long ms) noexcept { // suspend current thread for `ms` milliseconds
Sleep(ms);
}
}