https://github.com/python/cpython/commit/2c66318cdc0545da37e7046533dfe74bde129d91
commit: 2c66318cdc0545da37e7046533dfe74bde129d91
branch: main
author: Eric Snow <[email protected]>
committer: ericsnowcurrently <[email protected]>
date: 2024-06-17T13:16:00-06:00
summary:
gh-120524: Avoid a Race On
_PyRuntime.types.managed_static.types[i].interp_count (gh-120529)
gh-120182 added new global state (interp_count), but didn't add thread-safety
for it. This change eliminates the possible race.
files:
M Lib/test/test_interpreters/test_stress.py
M Objects/typeobject.c
diff --git a/Lib/test/test_interpreters/test_stress.py
b/Lib/test/test_interpreters/test_stress.py
index 40d2d77a7b9d3e..e400535b2a0e4e 100644
--- a/Lib/test/test_interpreters/test_stress.py
+++ b/Lib/test/test_interpreters/test_stress.py
@@ -22,7 +22,6 @@ def test_create_many_sequential(self):
interp = interpreters.create()
alive.append(interp)
- @unittest.skip('(temporary) gh-120524: there is a race that needs fixing')
@support.requires_resource('cpu')
def test_create_many_threaded(self):
alive = []
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index eb296414bb7bef..958f42430c80a2 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -246,7 +246,8 @@ managed_static_type_state_init(PyInterpreterState *interp,
PyTypeObject *self,
assert((initial == 1) ==
(_PyRuntime.types.managed_static.types[full_index].interp_count ==
0));
- _PyRuntime.types.managed_static.types[full_index].interp_count += 1;
+ (void)_Py_atomic_add_int64(
+ &_PyRuntime.types.managed_static.types[full_index].interp_count,
1);
if (initial) {
assert(_PyRuntime.types.managed_static.types[full_index].type == NULL);
@@ -300,7 +301,8 @@ managed_static_type_state_clear(PyInterpreterState *interp,
PyTypeObject *self,
state->type = NULL;
assert(state->tp_weaklist == NULL); // It was already cleared out.
- _PyRuntime.types.managed_static.types[full_index].interp_count -= 1;
+ (void)_Py_atomic_add_int64(
+ &_PyRuntime.types.managed_static.types[full_index].interp_count,
-1);
if (final) {
assert(!_PyRuntime.types.managed_static.types[full_index].interp_count);
_PyRuntime.types.managed_static.types[full_index].type = NULL;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
