Add more to the test.

Author: ZeroIntensity

Lib/test/test_free_threading/test_generators.py

@@ -2,28 +2,48 @@
 
 from unittest import TestCase
 
+from test import support
 from test.support import threading_helper
+from threading import Thread
 
 @threading_helper.requires_working_threading()
+@support.requires_resource("cpu")
 class TestGen(TestCase):
-    def test_generator_send(self):
-        import threading
-
+    def infinite_generator(self):
         def gen():
-            for _ in range(5_000):
+            while True:
                 yield
 
+        return gen()
+
+    def stress_generator(self, *funcs):
+        threads = []
+        gen = self.infinite_generator()
+
+        for func in funcs:
+            for _ in range(10):
+                def with_iterations(gen):
+                    for _ in range(100):
+                        func(gen)
 
-        it = gen()
-        with threading_helper.catch_threading_exception() as cm:
-            # next(it) is equivalent to it.send(None)
-            with threading_helper.start_threads(
-                (threading.Thread(target=lambda: next(it)) for _ in range(10))
-            ):
-                pass
+                threads.append(Thread(target=with_iterations, args=(gen,)))
+
+        for thread in threads:
+            thread.start()
+
+        for thread in threads:
+            thread.join()
+
+    def test_generator_send(self):
+        self.stress_generator(lambda gen: next(gen))
 
-            self.assertIsNone(cm.exc_value)
+    def test_generator_close(self):
+        self.stress_generator(lambda gen: gen.close())
+        self.stress_generator(lambda gen: next(gen), lambda gen: gen.close())
 
+    def test_generator_state(self):
+        self.stress_generator(lambda gen: next(gen), lambda gen: gen.gi_running)
+        self.stress_generator(lambda gen: gen.gi_isrunning, lambda gen: gen.close())
 
 if __name__ == "__main__":
     unittest.main()

Python/ceval.c

@@ -1741,6 +1741,7 @@ clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
     assert(frame->owner == FRAME_OWNED_BY_GENERATOR);
     PyGenObject *gen = _PyGen_GetGeneratorFromFrame(frame);
+    Py_BEGIN_CRITICAL_SECTION(gen);
     gen->gi_frame_state = FRAME_CLEARED;
     assert(tstate->exc_info == &gen->gi_exc_state);
     tstate->exc_info = gen->gi_exc_state.previous_item;
@@ -1751,6 +1752,7 @@ clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
     _PyErr_ClearExcState(&gen->gi_exc_state);
     tstate->c_recursion_remaining++;
     frame->previous = NULL;
+    Py_END_CRITICAL_SECTION();
 }
 
 void