gh-74953: Add _PyTime_FromMicrosecondsClamp() function (#93942)

vstinner · web-flow · commit e444752fabb6 · 2022-06-17T16:11:13.000+02:00
diff --git a/Include/cpython/pytime.h b/Include/cpython/pytime.h
@@ -130,6 +130,10 @@ PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds);
 /* Create a timestamp from a number of nanoseconds. */
 PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(_PyTime_t ns);
 
+/* Create a timestamp from a number of microseconds.
+ * Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow. */
+PyAPI_FUNC(_PyTime_t) _PyTime_FromMicrosecondsClamp(_PyTime_t us);
+
 /* Create a timestamp from nanoseconds (Python int). */
 PyAPI_FUNC(int) _PyTime_FromNanosecondsObject(_PyTime_t *t,
     PyObject *obj);
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -406,6 +406,14 @@ _PyTime_FromNanoseconds(_PyTime_t ns)
 }
 
 
+_PyTime_t
+_PyTime_FromMicrosecondsClamp(_PyTime_t us)
+{
+    _PyTime_t ns = _PyTime_Mul(us, US_TO_NS);
+    return pytime_from_nanoseconds(ns);
+}
+
+
 int
 _PyTime_FromNanosecondsObject(_PyTime_t *tp, PyObject *obj)
 {
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
@@ -438,22 +438,15 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
 
     _PyTime_t timeout;  // relative timeout
     if (microseconds >= 0) {
-        _PyTime_t ns;
-        if (microseconds <= _PyTime_MAX / 1000) {
-            ns = microseconds * 1000;
-        }
-        else {
-            // bpo-41710: PyThread_acquire_lock_timed() cannot report timeout
-            // overflow to the caller, so clamp the timeout to
-            // [_PyTime_MIN, _PyTime_MAX].
-            //
-            // _PyTime_MAX nanoseconds is around 292.3 years.
-            //
-            // _thread.Lock.acquire() and _thread.RLock.acquire() raise an
-            // OverflowError if microseconds is greater than PY_TIMEOUT_MAX.
-            ns = _PyTime_MAX;
-        }
-        timeout = _PyTime_FromNanoseconds(ns);
+        // bpo-41710: PyThread_acquire_lock_timed() cannot report timeout
+        // overflow to the caller, so clamp the timeout to
+        // [_PyTime_MIN, _PyTime_MAX].
+        //
+        // _PyTime_MAX nanoseconds is around 292.3 years.
+        //
+        // _thread.Lock.acquire() and _thread.RLock.acquire() raise an
+        // OverflowError if microseconds is greater than PY_TIMEOUT_MAX.
+        timeout = _PyTime_FromMicrosecondsClamp(microseconds);
     }
     else {
         timeout = _PyTime_FromNanoseconds(-1);

Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,14 @@ _PyTime_FromNanoseconds(_PyTime_t ns)`
`406`	`406`	`}`
`407`	`407`
`408`	`408`
	`409`	`+_PyTime_t`
	`410`	`+_PyTime_FromMicrosecondsClamp(_PyTime_t us)`
	`411`	`+{`
	`412`	`+ _PyTime_t ns = _PyTime_Mul(us, US_TO_NS);`
	`413`	`+ return pytime_from_nanoseconds(ns);`
	`414`	`+}`
	`415`	`+`
	`416`	`+`
`409`	`417`	`int`
`410`	`418`	`_PyTime_FromNanosecondsObject(_PyTime_t tp, PyObject obj)`
`411`	`419`	`{`