mirror/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-26 21:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-143424: Fix assertion in _PyMutex_LockTimed (gh-143439)

Browse Source 
The assertion doesn't necessarily hold for `threading.Lock`, so allow
the lock to be unlocked if `_PY_LOCK_PYTHONLOCK` is set on the flags.
This commit is contained in:
Sam Gross 2026-01-06 09:40:14 -05:00 committed by GitHub
parent d745b60ef2
commit 841b7482dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Python/lock.c
View File

@ -124,8 +124,11 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
&entry, (flags & _PY_LOCK_DETACH) != 0);
if (ret == Py_PARK_OK) {
if (entry.handed_off) {
// We own the lock now.
assert(_Py_atomic_load_uint8_relaxed(&m->_bits) & _Py_LOCKED);
// We own the lock now. thread.Lock allows other threads
// to concurrently release the lock so we cannot assert that
// it is locked if _PY_LOCK_PYTHONLOCK is set.
assert(_Py_atomic_load_uint8_relaxed(&m->_bits) & _Py_LOCKED ||
(flags & _PY_LOCK_PYTHONLOCK) != 0);
return PY_LOCK_ACQUIRED;
}
}