mirror of
https://github.com/python/cpython.git
synced 2025-10-19 16:03:42 +00:00
gh-140080: Clear atexit
callbacks when memory allocation fails during finalization (GH-140103)
This fixes a regression introduced by GH-136004, in which finalization would hang while executing atexit handlers if the system was out of memory. --------- Signed-off-by: yihong0618 <zouzou0208@gmail.com> Co-authored-by: Peter Bierma <zintensitydev@gmail.com> Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
parent
32c264982e
commit
a05aece543
3 changed files with 36 additions and 1 deletions
|
@ -1,9 +1,11 @@
|
||||||
import atexit
|
import atexit
|
||||||
import os
|
import os
|
||||||
|
import subprocess
|
||||||
import textwrap
|
import textwrap
|
||||||
import unittest
|
import unittest
|
||||||
from test import support
|
from test import support
|
||||||
from test.support import script_helper
|
from test.support import SuppressCrashReport, script_helper
|
||||||
|
from test.support import os_helper
|
||||||
from test.support import threading_helper
|
from test.support import threading_helper
|
||||||
|
|
||||||
class GeneralTest(unittest.TestCase):
|
class GeneralTest(unittest.TestCase):
|
||||||
|
@ -189,6 +191,37 @@ def callback():
|
||||||
self.assertEqual(os.read(r, len(expected)), expected)
|
self.assertEqual(os.read(r, len(expected)), expected)
|
||||||
os.close(r)
|
os.close(r)
|
||||||
|
|
||||||
|
# Python built with Py_TRACE_REFS fail with a fatal error in
|
||||||
|
# _PyRefchain_Trace() on memory allocation error.
|
||||||
|
@unittest.skipIf(support.Py_TRACE_REFS, 'cannot test Py_TRACE_REFS build')
|
||||||
|
def test_atexit_with_low_memory(self):
|
||||||
|
# gh-140080: Test that setting low memory after registering an atexit
|
||||||
|
# callback doesn't cause an infinite loop during finalization.
|
||||||
|
code = textwrap.dedent("""
|
||||||
|
import atexit
|
||||||
|
import _testcapi
|
||||||
|
|
||||||
|
def callback():
|
||||||
|
print("hello")
|
||||||
|
|
||||||
|
atexit.register(callback)
|
||||||
|
# Simulate low memory condition
|
||||||
|
_testcapi.set_nomemory(0)
|
||||||
|
""")
|
||||||
|
|
||||||
|
with os_helper.temp_dir() as temp_dir:
|
||||||
|
script = script_helper.make_script(temp_dir, 'test_atexit_script', code)
|
||||||
|
with SuppressCrashReport():
|
||||||
|
with script_helper.spawn_python(script,
|
||||||
|
stderr=subprocess.PIPE) as proc:
|
||||||
|
proc.wait()
|
||||||
|
stdout = proc.stdout.read()
|
||||||
|
stderr = proc.stderr.read()
|
||||||
|
|
||||||
|
self.assertIn(proc.returncode, (0, 1))
|
||||||
|
self.assertNotIn(b"hello", stdout)
|
||||||
|
self.assertIn(b"MemoryError", stderr)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Fix hang during finalization when attempting to call :mod:`atexit` handlers under no memory.
|
|
@ -112,6 +112,7 @@ atexit_callfuncs(struct atexit_state *state)
|
||||||
{
|
{
|
||||||
PyErr_FormatUnraisable("Exception ignored while "
|
PyErr_FormatUnraisable("Exception ignored while "
|
||||||
"copying atexit callbacks");
|
"copying atexit callbacks");
|
||||||
|
atexit_cleanup(state);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue