mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
3d4ac1a2c2
Concurrent accesses from multiple threads to the same `cell` object did not scale well in the free-threaded build. Use `_PyStackRef` and optimistically avoid locking to improve scaling. With the locks around cell reads gone, some of the free threading tests were prone to starvation: the readers were able to run in a tight loop and the writer threads weren't scheduled frequently enough to make timely progress. Adjust the tests to avoid this. Co-authored-by: Donghee Na <donghee.na@python.org>
67 lines
2.5 KiB
Python
67 lines
2.5 KiB
Python
import concurrent.futures
|
|
import unittest
|
|
import inspect
|
|
from threading import Barrier
|
|
from unittest import TestCase
|
|
|
|
from test.support import threading_helper, Py_GIL_DISABLED
|
|
|
|
threading_helper.requires_working_threading(module=True)
|
|
|
|
|
|
def get_func_annotation(f, b):
|
|
b.wait()
|
|
return inspect.get_annotations(f)
|
|
|
|
|
|
def get_func_annotation_dunder(f, b):
|
|
b.wait()
|
|
return f.__annotations__
|
|
|
|
|
|
def set_func_annotation(f, b):
|
|
b.wait()
|
|
f.__annotations__ = {'x': int, 'y': int, 'return': int}
|
|
return f.__annotations__
|
|
|
|
|
|
@unittest.skipUnless(Py_GIL_DISABLED, "Enable only in FT build")
|
|
class TestFTFuncAnnotations(TestCase):
|
|
NUM_THREADS = 4
|
|
|
|
def test_concurrent_read(self):
|
|
def f(x: int) -> int:
|
|
return x + 1
|
|
|
|
for _ in range(10):
|
|
with concurrent.futures.ThreadPoolExecutor(max_workers=self.NUM_THREADS) as executor:
|
|
b = Barrier(self.NUM_THREADS)
|
|
futures = {executor.submit(get_func_annotation, f, b): i for i in range(self.NUM_THREADS)}
|
|
for fut in concurrent.futures.as_completed(futures):
|
|
annotate = fut.result()
|
|
self.assertIsNotNone(annotate)
|
|
self.assertEqual(annotate, {'x': int, 'return': int})
|
|
|
|
with concurrent.futures.ThreadPoolExecutor(max_workers=self.NUM_THREADS) as executor:
|
|
b = Barrier(self.NUM_THREADS)
|
|
futures = {executor.submit(get_func_annotation_dunder, f, b): i for i in range(self.NUM_THREADS)}
|
|
for fut in concurrent.futures.as_completed(futures):
|
|
annotate = fut.result()
|
|
self.assertIsNotNone(annotate)
|
|
self.assertEqual(annotate, {'x': int, 'return': int})
|
|
|
|
def test_concurrent_write(self):
|
|
def bar(x: int, y: float) -> float:
|
|
return y ** x
|
|
|
|
for _ in range(10):
|
|
with concurrent.futures.ThreadPoolExecutor(max_workers=self.NUM_THREADS) as executor:
|
|
b = Barrier(self.NUM_THREADS)
|
|
futures = {executor.submit(set_func_annotation, bar, b): i for i in range(self.NUM_THREADS)}
|
|
for fut in concurrent.futures.as_completed(futures):
|
|
annotate = fut.result()
|
|
self.assertIsNotNone(annotate)
|
|
self.assertEqual(annotate, {'x': int, 'y': int, 'return': int})
|
|
|
|
# func_get_annotations returns in-place dict, so bar.__annotations__ should be modified as well
|
|
self.assertEqual(bar.__annotations__, {'x': int, 'y': int, 'return': int})
|