From: Matt Prodani <mattp@nyu.edu>
Date: Wed, 6 Dec 2023 06:54:57 +0000 (-0500)
Subject: gh-112606: Use sem_clockwait with monotonic time when supported in parking_lot.c... 
X-Git-Tag: v3.13.0a3~507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2a46f9f1e08be26fa1f732a2b92e355ad812abf;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/parking_lot.c b/Python/parking_lot.c
index 664e622cc174..d44c1b4b93b4 100644
--- a/Python/parking_lot.c
+++ b/Python/parking_lot.c
@@ -118,10 +118,19 @@ _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
         _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);
@@ -151,7 +160,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);
         }