diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2024-06-17 19:16:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 19:16:00 (GMT) |
| commit | 2c66318cdc0545da37e7046533dfe74bde129d91 (patch) | |
| tree | 13c31f6df905d37a572718bf4994ffeb04c28f38 | |
| parent | e73c42e15cf83c7a81de016ce2827c04110c80c3 (diff) | |
| download | cpython-2c66318cdc0545da37e7046533dfe74bde129d91.zip cpython-2c66318cdc0545da37e7046533dfe74bde129d91.tar.gz cpython-2c66318cdc0545da37e7046533dfe74bde129d91.tar.bz2 | |
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.
| -rw-r--r-- | Lib/test/test_interpreters/test_stress.py | 1 | ||||
| -rw-r--r-- | Objects/typeobject.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_interpreters/test_stress.py b/Lib/test/test_interpreters/test_stress.py index 40d2d77..e400535 100644 --- a/Lib/test/test_interpreters/test_stress.py +++ b/Lib/test/test_interpreters/test_stress.py @@ -22,7 +22,6 @@ class StressTests(TestBase): 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 eb29641..958f424 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; |