Skip to content

gh-135871: Reload lock internal state while spinning in PyMutex_LockTimed #146064

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
colesbury merged 5 commits into from
Mar 23, 2026
Merged

gh-135871: Reload lock internal state while spinning in PyMutex_LockTimed #146064

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7217ad0
gh-135871: Reload lock internal state while spinning in `_PyMutex_Loc…
dpdani Feb 27, 2026
54932d6
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 19, 2026
f1eaffa
parentheses for casting
dpdani Mar 23, 2026
5fee9e4
RELOAD_SPIN_COUNT -> RELOAD_SPIN_MASK
dpdani Mar 23, 2026
e7b874e
Merge branch 'main' into pymutex-spinning-reload
colesbury Mar 23, 2026
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
Prev Previous commit
Next Next commit
RELOAD_SPIN_COUNT -> RELOAD_SPIN_MASK 
Change-Id: I5df04888df81de26a04450a9a1a04d4db5026383
  • Loading branch information
@dpdani
dpdani committed Mar 23, 2026
commit 5fee9e4e0c484ae54fcb8474507ac6115bdc86da
6 changes: 3 additions & 3 deletions Python/lock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ static const PyTime_t TIME_TO_BE_FAIR_NS = 1000*1000;
// enabled.
#if Py_GIL_DISABLED
static const int MAX_SPIN_COUNT = 40;
static const int RELOAD_SPIN_COUNT = 3;
static const int RELOAD_SPIN_MASK = 3;
#else
static const int MAX_SPIN_COUNT = 0;
static const int RELOAD_SPIN_COUNT = 1;
static const int RELOAD_SPIN_MASK = 1;
#endif

struct mutex_entry {
Expand Down Expand Up @@ -104,7 +104,7 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
// Spin for a bit.
_Py_yield();
spin_count++;
if (((spin_count + tid) & RELOAD_SPIN_COUNT) == 0) {
if (((spin_count + tid) & RELOAD_SPIN_MASK) == 0) {
v = _Py_atomic_load_uint8_relaxed(&m->_bits);
}
continue;
Expand Down
Loading