]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-135871: Fix needless spinning in `_PyMutex_LockTimed` with zero timeout...
authorSam Gross <colesbury@gmail.com>
Wed, 25 Jun 2025 17:09:17 +0000 (13:09 -0400)
committerGitHub <noreply@github.com>
Wed, 25 Jun 2025 17:09:17 +0000 (17:09 +0000)
The free threading build could spin unnecessarily on `_Py_yield()` if the initial
compare and swap failed.
(cherry picked from commit cbfaf41caf135b8598a560854cd59e992a2ccfed)

Co-authored-by: Joseph Tibbertsma <josephtibbertsma@gmail.com>
Misc/NEWS.d/next/Core and Builtins/2025-06-23-18-08-32.gh-issue-135871.50C528.rst [new file with mode: 0644]
Python/lock.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-06-23-18-08-32.gh-issue-135871.50C528.rst b/Misc/NEWS.d/next/Core and Builtins/2025-06-23-18-08-32.gh-issue-135871.50C528.rst
new file mode 100644 (file)
index 0000000..ce29dde
--- /dev/null
@@ -0,0 +1,2 @@
+Non-blocking mutex lock attempts now return immediately when the lock is busy
+instead of briefly spinning in the :term:`free threading` build.
index 49f46ea36f72acb44ad9e0012a62cf8cdbb8ca35..24c404a12461302b4219ea1b73659696c327d5a2 100644 (file)
@@ -58,7 +58,7 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
             return PY_LOCK_ACQUIRED;
         }
     }
-    else if (timeout == 0) {
+    if (timeout == 0) {
         return PY_LOCK_FAILURE;
     }