-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
gh-136003: Execute pre-finalization callbacks in a loop #136004
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ZeroIntensity
wants to merge
23
commits into
python:main
Choose a base branch
from
ZeroIntensity:fix-circular-finalization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+215
−31
Open
Changes from 8 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
354e6b5
Execute early finalization handlers in a loop
ZeroIntensity 3090524
Store Py_MAX result in a variable.
ZeroIntensity 43038b8
Add a test in test_atexit.
ZeroIntensity 8d4151c
Deal with it in Py_EndInterpreter() as well.
ZeroIntensity add4d33
Add a blurb entry.
ZeroIntensity 3edc3a8
Check the return code in the test.
ZeroIntensity ec57918
Add a test for pending calls.
ZeroIntensity 970153b
Fix tests on Windows.
ZeroIntensity cfd62b8
Use os.linesep.
ZeroIntensity 859070f
Use an RW lock instead of a counter.
ZeroIntensity 37098a0
Merge branch 'main' of https://github.com/python/cpython into fix-cir…
ZeroIntensity 8a1aa13
Remove more counters.
ZeroIntensity cbcd552
Remove old artifacts (again).
ZeroIntensity 54613a1
Final time removing artifacts.
ZeroIntensity 9ccdb5f
(I lied)
ZeroIntensity 9cd75b7
Atomically check if there are threads, atexit callbacks, or pending c…
ZeroIntensity 1360059
Remove stray newline change.
ZeroIntensity 475538a
Add a test for atexit with subinterpreters.
ZeroIntensity a794188
Check for os.pipe() in the test.
ZeroIntensity 2dda7a4
Rely on stop-the-world and the GIL instead of a dedicated RW mutex.
ZeroIntensity f1460af
Serialize pending calls via the ceval mutex.
ZeroIntensity 1e1301d
Only check for non-daemon threads at finalization.
ZeroIntensity 51a20d4
Fix assertion failures on the GILful build.
ZeroIntensity File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
from test import support | ||
from test.support import MISSING_C_DOCSTRINGS | ||
from test.support import import_helper | ||
from test.support import script_helper | ||
from test.support import threading_helper | ||
from test.support import warnings_helper | ||
from test.support import requires_limited_api | ||
|
@@ -1641,6 +1642,37 @@ def subthread(): | |
|
||
self.assertEqual(actual, int(interpid)) | ||
|
||
@threading_helper.requires_working_threading() | ||
def test_pending_call_creates_thread(self): | ||
Comment on lines
+1645
to
+1646
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Likewise, it would probably make sense to extend this with a subtest to check it in a subinterpreter. Also, it would be good to test adding a pending call to a different interpreter during its finalization. |
||
source = """ | ||
import _testcapi | ||
import threading | ||
import time | ||
|
||
|
||
def output(): | ||
print(24) | ||
time.sleep(1) | ||
print(42) | ||
|
||
|
||
def callback(): | ||
threading.Thread(target=output).start() | ||
|
||
|
||
def create_pending_call(): | ||
time.sleep(1) | ||
_testcapi.simple_pending_call(callback) | ||
|
||
|
||
threading.Thread(target=create_pending_call).start() | ||
""" | ||
return_code, stdout, stderr = script_helper.assert_python_ok('-c', textwrap.dedent(source)) | ||
self.assertEqual(return_code, 0) | ||
end = "\r\n" if os.name == "nt" else "\n" | ||
self.assertEqual(stdout, f"24{end}42{end}".encode("utf-8")) | ||
self.assertEqual(stderr, b"") | ||
|
||
|
||
class SubinterpreterTest(unittest.TestCase): | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Core_and_Builtins/2025-06-26-18-44-34.gh-issue-136003.sln51d.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Fix :class:`threading.Thread` objects becoming incorrectly daemon when | ||
created from an :mod:`atexit` callback or a pending call | ||
(:c:func:`Py_AddPendingCall`). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would probably make sense to extend this with a subtest to check it in a subinterpreter.