Skip to content

gh-126631: fix pre-loading of __main__ #135295

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Sep 7, 2025
Merged

gh-126631: fix pre-loading of __main__ #135295

merged 5 commits into from
Sep 7, 2025

Conversation

@duaneg
Copy link
Contributor

@duaneg duaneg commented Jun 9, 2025 •
edited by bedevere-app bot
Loading

The main_path parameter was renamed init_main_from_name, update the forkserver code accordingly.

@duaneg
pythongh-126631: fix pre-loading of __main__
ec33463 
The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.
@bedevere-app bedevere-app bot mentioned this pull request Jun 9, 2025
Open
@duaneg duaneg marked this pull request as ready for review June 10, 2025 09:45
@duaneg duaneg requested a review from gpshead as a code owner June 10, 2025 09:45
@duaneg
Copy link
Contributor Author

duaneg commented Jun 10, 2025 •
edited
Loading

If/when #135335 is fixed we can remove the explicit flush from the test script. Likewise, if/when this is fixed the regression test in the PR for that issue can be simplified to just use a script (preloading __main__) instead of having to create and import a module.

@duaneg duaneg mentioned this pull request Sep 1, 2025
Closed
@emaxx-google
Copy link

emaxx-google commented Sep 3, 2025

@gpshead could we proceed with this PR in favor of my #138048 (which is essentially identical, but lacks test coverage)? This would fix the performance issue reported in #137996.

@duaneg
Copy link
Contributor Author

duaneg commented Sep 4, 2025

@gpshead could we proceed with this PR in favor of my #138048 (which is essentially identical, but lacks test coverage)?

FTR, I'd be perfectly fine with you copying the regression test from this into your PR, too. Whatever is easiest!

@gpshead gpshead self-assigned this Sep 7, 2025
@gpshead gpshead added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes type-bug An unexpected behavior, bug, or error labels Sep 7, 2025
@gpshead gpshead enabled auto-merge (squash) September 7, 2025 07:27
@gpshead gpshead mentioned this pull request Sep 7, 2025
Closed
@gpshead gpshead merged commit 0912b3a into python:main Sep 7, 2025
55 checks passed
@miss-islington-app
Copy link

miss-islington-app bot commented Sep 7, 2025

Thanks @duaneg for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 7, 2025
@duaneg @gpshead @miss-islington
pythongh-126631: pythongh-137996: fix pre-loading of __main__ (pyth…
92c663b 
…onGH-135295)

pythongh-126631: pythongh-137996: fix pre-loading of `__main__`

The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.  This was leading to slower startup times when people
were trying to preload the main module.

---------
(cherry picked from commit 0912b3a)

Co-authored-by: Duane Griffin <[email protected]>
Co-authored-by: Gregory P. Smith <[email protected]>
@miss-islington-app
Copy link

miss-islington-app bot commented Sep 7, 2025

Sorry, @duaneg and @gpshead, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 0912b3a6dbd226bea79eb8d70d5a06230804d4cb 3.13

@bedevere-app
Copy link

bedevere-app bot commented Sep 7, 2025

GH-138607 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Sep 7, 2025
gpshead added a commit to gpshead/cpython that referenced this pull request Sep 7, 2025
@duaneg @gpshead
[3.13] pythongh-126631: pythongh-137996: fix pre-loading of __main__ (
c376dea 
pythonGH-135295)

pythongh-126631: pythongh-137996: fix pre-loading of `__main__`

The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.  This was leading to slower startup times when people
were trying to preload the main module.

---------
(cherry picked from commit 0912b3a)

Co-authored-by: Duane Griffin <[email protected]>
Co-authored-by: Gregory P. Smith <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Sep 7, 2025

GH-138609 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Sep 7, 2025
gpshead added a commit that referenced this pull request Sep 8, 2025
@gpshead @duaneg
[3.13] gh-126631: gh-137996: fix pre-loading of __main__ (GH-135295) (
9a6137a 
#138609)

gh-126631: gh-137996: fix pre-loading of `__main__`

The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.  This was leading to slower startup times when people
were trying to preload the main module.

---------
(cherry picked from commit 0912b3a)

Co-authored-by: Duane Griffin <[email protected]>
@emaxx-google
Copy link

emaxx-google commented Sep 8, 2025

Thanks a lot, @duaneg and @gpshead!

lkollar pushed a commit to lkollar/cpython that referenced this pull request Sep 9, 2025
@duaneg @gpshead @lkollar
pythongh-126631: pythongh-137996: fix pre-loading of __main__ (pyth…
2ff72e8 
…onGH-135295)

pythongh-126631: pythongh-137996: fix pre-loading of `__main__`

The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.  This was leading to slower startup times when people
were trying to preload the main module.

---------

Co-authored-by: Gregory P. Smith <[email protected]>
gpshead added a commit that referenced this pull request Oct 8, 2025
@miss-islington @duaneg
@gpshead @encukou
[3.14] gh-126631: gh-137996: fix pre-loading of __main__ (GH-135295) (
64f0e2d 
#138607)

gh-126631: gh-137996: fix pre-loading of `__main__` (GH-135295)

gh-126631: gh-137996: fix pre-loading of `__main__`

The `main_path` parameter was renamed `init_main_from_name`, update the
forkserver code accordingly.  This was leading to slower startup times when people
were trying to preload the main module.

---------
(cherry picked from commit 0912b3a)

Co-authored-by: Duane Griffin <[email protected]>
Co-authored-by: Gregory P. Smith <[email protected]>
Co-authored-by: Petr Viktorin <[email protected]>
Co-authored-by: Gregory P. Smith <[email protected]>
This was referenced Oct 9, 2025
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes

Assignees

@gpshead gpshead

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@duaneg @emaxx-google @gpshead