diff options
author | Brett Simmers <swtaarrs@users.noreply.github.com> | 2024-03-04 16:29:39 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-04 16:29:39 (GMT) |
commit | 0adfa8482d369899e9963206a3307f423309e10c (patch) | |
tree | c1f71c0f65b0f01581d37eafa55c26b769915299 /Lib/test/test_monitoring.py | |
parent | 15dc2979bc1b24269177f0e150495abb7f3eb546 (diff) | |
download | cpython-0adfa8482d369899e9963206a3307f423309e10c.zip cpython-0adfa8482d369899e9963206a3307f423309e10c.tar.gz cpython-0adfa8482d369899e9963206a3307f423309e10c.tar.bz2 |
gh-115832: Fix instrumentation version mismatch during interpreter shutdown (#115856)
A previous commit introduced a bug to `interpreter_clear()`: it set
`interp->ceval.instrumentation_version` to 0, without making the corresponding
change to `tstate->eval_breaker` (which holds a thread-local copy of the
version). After this happens, Python code can still run due to object finalizers
during a GC, and the version check in bytecodes.c will see a different result
than the one in instrumentation.c causing an infinite loop.
The fix itself is straightforward: clear `tstate->eval_breaker` when clearing
`interp->ceval.instrumentation_version`.
Diffstat (limited to 'Lib/test/test_monitoring.py')
-rw-r--r-- | Lib/test/test_monitoring.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py index b027959..1e77eb6 100644 --- a/Lib/test/test_monitoring.py +++ b/Lib/test/test_monitoring.py @@ -9,7 +9,8 @@ import textwrap import types import unittest import asyncio -from test.support import requires_specialization +from test import support +from test.support import requires_specialization, script_helper PAIR = (0,1) @@ -1858,3 +1859,12 @@ class TestTier2Optimizer(CheckEvents): sys.monitoring.register_callback(TEST_TOOL, E.LINE, None) sys.monitoring.set_events(TEST_TOOL, 0) self.assertGreater(len(events), 250) + +class TestMonitoringAtShutdown(unittest.TestCase): + + def test_monitoring_live_at_shutdown(self): + # gh-115832: An object destructor running during the final GC of + # interpreter shutdown triggered an infinite loop in the + # instrumentation code. + script = support.findfile("_test_monitoring_shutdown.py") + script_helper.run_test_script(script) |