Skip to content

gh-112606: Use sem_clockwait with monotonic time when supported in parking_lot.c #112733

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
corona10 merged 3 commits into from
Dec 6, 2023
Merged

gh-112606: Use sem_clockwait with monotonic time when supported in parking_lot.c #112733

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2329769
Use sem_clockwait with monotonic time when supported in parking_lot.c
mattprodani Dec 4, 2023
4a8dfac
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 4, 2023
4271108
Revert blurp and remove comment
mattprodani Dec 6, 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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-12-04-23-51-40.gh-issue-112606.pHvfIs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
If ``sem_clockwait`` and ``CLOCK_MONOTONIC`` are supported, ``parking_lot.c`` will use ``sem_clockwait`` with monotonic time rather than system time in ``_PySemaphore_PlatformWait``.
14 changes: 12 additions & 2 deletions Python/parking_lot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,20 @@ _PySemaphore_PlatformWait(_PySemaphore *sema, _PyTime_t timeout)
if (timeout >= 0) {
struct timespec ts;

#if defined(CLOCK_MONOTONIC) && defined(HAVE_SEM_CLOCKWAIT)
_PyTime_t deadline = _PyTime_Add(_PyTime_GetMonotonicClock(), timeout);

_PyTime_AsTimespec_clamp(deadline, &ts);

err = sem_clockwait(&sema->platform_sem, CLOCK_MONOTONIC, &ts);
#else
// does not support CLOCK_MONOTONIC, use system clock
_PyTime_t deadline = _PyTime_Add(_PyTime_GetSystemClock(), timeout);
_PyTime_AsTimespec(deadline, &ts);

_PyTime_AsTimespec_clamp(deadline, &ts);

err = sem_timedwait(&sema->platform_sem, &ts);
#endif
}
else {
err = sem_wait(&sema->platform_sem);
Expand Down Expand Up @@ -151,7 +161,7 @@ _PySemaphore_PlatformWait(_PySemaphore *sema, _PyTime_t timeout)
struct timespec ts;

_PyTime_t deadline = _PyTime_Add(_PyTime_GetSystemClock(), timeout);
_PyTime_AsTimespec(deadline, &ts);
_PyTime_AsTimespec_clamp(deadline, &ts);

err = pthread_cond_timedwait(&sema->cond, &sema->mutex, &ts);
}
Expand Down