gh-120524: Avoid a Race On _PyRuntime.types.managed_static.types[i].i… · python/cpython@2c66318 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 37.3k
• Star 77.5k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2c66318

Browse filesBrowse the repository at this point in the historyBrowse files

ericsnowcurrently

authored

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.

1 parent e73c42e commit 2c66318
Copy full SHA for 2c66318

2 files changed

+4-3Lines changed: 4 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test/test_interpreters
  • test_stress.py
• Objects
  • typeobject.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_interpreters/test_stress.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_interpreters/test_stress.py

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -22,7 +22,6 @@ def test_create_many_sequential(self):
22	22	interp = interpreters.create()
23	23	alive.append(interp)
24	24
25		- @unittest.skip('(temporary) gh-120524: there is a race that needs fixing')
26	25	@support.requires_resource('cpu')
27	26	def test_create_many_threaded(self):
28	27	alive = []

Collapse file

‎Objects/typeobject.c‎

Copy file name to clipboardExpand all lines: Objects/typeobject.c

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -246,7 +246,8 @@ managed_static_type_state_init(PyInterpreterState *interp, PyTypeObject *self,
246	246
247	247	assert((initial == 1) ==
248	248	(_PyRuntime.types.managed_static.types[full_index].interp_count == 0));
249		- _PyRuntime.types.managed_static.types[full_index].interp_count += 1;
	249	+ (void)_Py_atomic_add_int64(
	250	+ &_PyRuntime.types.managed_static.types[full_index].interp_count, 1);
250	251
251	252	if (initial) {
252	253	assert(_PyRuntime.types.managed_static.types[full_index].type == NULL);
@@ -300,7 +301,8 @@ managed_static_type_state_clear(PyInterpreterState *interp, PyTypeObject *self,
300	301	state->type = NULL;
301	302	assert(state->tp_weaklist == NULL); // It was already cleared out.
302	303
303		- _PyRuntime.types.managed_static.types[full_index].interp_count -= 1;
	304	+ (void)_Py_atomic_add_int64(
	305	+ &_PyRuntime.types.managed_static.types[full_index].interp_count, -1);
304	306	if (final) {
305	307	assert(!_PyRuntime.types.managed_static.types[full_index].interp_count);
306	308	_PyRuntime.types.managed_static.types[full_index].type = NULL;

0 commit comments

Comments

0 (0)