mirror of https://github.com/python/cpython
gh-116604: Correctly honor the gc status when calling _Py_RunGC (#116628)
This commit is contained in:
parent
eb947cdc13
commit
02918aa961
|
@ -1397,6 +1397,31 @@ class GCTogglingTests(unittest.TestCase):
|
|||
# empty __dict__.
|
||||
self.assertEqual(x, None)
|
||||
|
||||
def test_indirect_calls_with_gc_disabled(self):
|
||||
junk = []
|
||||
i = 0
|
||||
detector = GC_Detector()
|
||||
while not detector.gc_happened:
|
||||
i += 1
|
||||
if i > 10000:
|
||||
self.fail("gc didn't happen after 10000 iterations")
|
||||
junk.append([]) # this will eventually trigger gc
|
||||
|
||||
try:
|
||||
gc.disable()
|
||||
junk = []
|
||||
i = 0
|
||||
detector = GC_Detector()
|
||||
while not detector.gc_happened:
|
||||
i += 1
|
||||
if i > 10000:
|
||||
break
|
||||
junk.append([]) # this may eventually trigger gc (if it is enabled)
|
||||
|
||||
self.assertEqual(i, 10001)
|
||||
finally:
|
||||
gc.enable()
|
||||
|
||||
|
||||
class PythonFinalizationTests(unittest.TestCase):
|
||||
def test_ast_fini(self):
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
Respect the status of the garbage collector when indirect calls are made via
|
||||
:c:func:`PyErr_CheckSignals` and the evaluation breaker. Patch by Pablo
|
||||
Galindo
|
|
@ -1805,6 +1805,10 @@ _PyObject_GC_Link(PyObject *op)
|
|||
void
|
||||
_Py_RunGC(PyThreadState *tstate)
|
||||
{
|
||||
GCState *gcstate = get_gc_state();
|
||||
if (!gcstate->enabled) {
|
||||
return;
|
||||
}
|
||||
gc_collect_main(tstate, GENERATION_AUTO, _Py_GC_REASON_HEAP);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue