mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-04 16:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.13] gh-124642: Dictionaries aren't marking objects as weakref'd (GH-124643) (#124798)

Browse source 
gh-124642: Dictionaries aren't marking objects as weakref'd (GH-124643)

Dictionaries aren't marking objects as weakref'd
(cherry picked from commit 077e7ef6a0)

Co-authored-by: Dino Viehland <dinoviehland@meta.com>
This commit is contained in:
Miss Islington (bot) 2024-09-30 22:51:24 +02:00 • committed by GitHub
parent fe58596cce
commit 44ba11a204
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core_and_Builtins/2024-09-27-17-18-53.gh-issue-124642.OCjhBJ.rst Normal file
View file

@ -0,0 +1 @@
Fixed scalability issue in free-threaded builds for lock-free reads from dictionaries in multi-threaded scenarios

6
Objects/dictobject.c
View file

@ -1549,7 +1549,7 @@ read_failed:
*value_addr = value; *value_addr = value;
if (value != NULL) { if (value != NULL) {
assert(ix >= 0); assert(ix >= 0);
Py_INCREF(value); _Py_NewRefWithLock(value);
} }
Py_END_CRITICAL_SECTION(); Py_END_CRITICAL_SECTION();
return ix; return ix;
@ -6988,7 +6988,7 @@ _PyObject_TryGetInstanceAttribute(PyObject *obj, PyObject *name, PyObject **attr
// Still no dict, we can read from the values // Still no dict, we can read from the values
assert(values->valid); assert(values->valid);
value = values->values[ix]; value = values->values[ix];
*attr = Py_XNewRef(value); *attr = _Py_XNewRefWithLock(value);
success = true; success = true;
} }
@ -7008,7 +7008,7 @@ _PyObject_TryGetInstanceAttribute(PyObject *obj, PyObject *name, PyObject **attr
if (dict->ma_values == values && FT_ATOMIC_LOAD_UINT8(values->valid)) { if (dict->ma_values == values && FT_ATOMIC_LOAD_UINT8(values->valid)) {
value = _Py_atomic_load_ptr_relaxed(&values->values[ix]); value = _Py_atomic_load_ptr_relaxed(&values->values[ix]);
*attr = Py_XNewRef(value); *attr = _Py_XNewRefWithLock(value);
success = true; success = true;
} else { } else {
// Caller needs to lookup from the dictionary // Caller needs to lookup from the dictionary