Skip to content
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

GH-99205: Mark new interpreters and threads as non-static #99268

Merged
merged 4 commits into from
Nov 9, 2022
Merged

GH-99205: Mark new interpreters and threads as non-static #99268

merged 4 commits into from
Nov 9, 2022

Conversation

brandtbucher
Copy link
Member

@brandtbucher brandtbucher commented Nov 9, 2022 •
edited by bedevere-bot
Loading

@brandtbucher brandtbucher added type-bug An unexpected behavior, bug, or error interpreter-core (Objects, Python, Grammar, and Parser dirs) needs backport to 3.11 only security fixes labels Nov 9, 2022
@brandtbucher brandtbucher self-assigned this Nov 9, 2022
@bedevere-bot bedevere-bot mentioned this pull request Nov 9, 2022
Closed
kumaraditya303
kumaraditya303 approved these changes Nov 9, 2022
View reviewed changes
Copy link
Contributor

@kumaraditya303 kumaraditya303 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ericsnowcurrently
ericsnowcurrently approved these changes Nov 9, 2022
View reviewed changes
Copy link
Member

@ericsnowcurrently ericsnowcurrently left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

I've pointed out two places where a comment would be appropriate. I'm approving the PR under the assumption you'll take care of those.

Python/pystate.c Show resolved Hide resolved
Python/pystate.c
@@ -848,6 +851,7 @@ new_threadstate(PyInterpreterState *interp)
memcpy(tstate,
&initial._main_interpreter._initial_thread,
sizeof(*tstate));
tstate->_static = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a note pointing to PyThreadState_INIT() and indicating that fields set there should be adjusted here as appropriate.

Python/pystate.c
@@ -370,6 +371,7 @@ PyInterpreterState_New(void)
// Set to _PyInterpreterState_INIT.
memcpy(interp, &initial._main_interpreter,
sizeof(*interp));
interp->_static = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise, a note pointing to PyInterpreterState_INIT().

@ericsnowcurrently
Copy link
Member

Thanks for fixing this, BTW.

@brandtbucher
Copy link
Member Author

@pablogsal, leak tests didn't catch this because we use the "raw" domain to allocate PyThreadState and PyInterpreterState.

@fuzzard fuzzard mentioned this pull request Nov 9, 2022
Merged
@pablogsal
Copy link
Member

Oh interesting, can you confirm that changing the domain to memory makes the test fail?

@brandtbucher
Copy link
Member Author

brandtbucher commented Nov 9, 2022 •
edited
Loading

Oh interesting, can you confirm that changing the domain to memory makes the test fail?

You can't. :)

Fatal Python error: _PyMem_DebugCalloc: Python memory allocator called without holding the GIL
Python runtime state: preinitialized

See this comment:

cpython/Python/pystate.c

Lines 818 to 821 in 58ee5d8

// We don't need to allocate a thread state for the main interpreter
// (the common case), but doing it later for the other case revealed a
// reentrancy problem (deadlock). So for now we always allocate before
// taking the interpreters lock. See GH-96071.

@brandtbucher brandtbucher merged commit 283ab0e into python:main Nov 9, 2022
@miss-islington
Copy link
Contributor

Thanks @brandtbucher for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-99301 is a backport of this pull request to the 3.11 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 9, 2022
@brandtbucher @miss-islington
pythonGH-99205: Mark new interpreters and threads as non-static (pyth…
27763ef 
…onGH-99268)

(cherry picked from commit 283ab0e)

Co-authored-by: Brandt Bucher <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Nov 9, 2022
miss-islington added a commit that referenced this pull request Nov 9, 2022
@miss-islington @brandtbucher
GH-99205: Mark new interpreters and threads as non-static (GH-99268)
7c9c993 
(cherry picked from commit 283ab0e)

Co-authored-by: Brandt Bucher <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@ericsnowcurrently ericsnowcurrently ericsnowcurrently approved these changes

@pablogsal pablogsal Awaiting requested review from pablogsal

Assignees

@brandtbucher brandtbucher

Labels
interpreter-core (Objects, Python, Grammar, and Parser dirs) type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@brandtbucher @ericsnowcurrently @pablogsal @miss-islington @bedevere-bot @kumaraditya303