gh-94673: Clarify About Runtime State Related to Static Builtin Types #117761
Conversation
This file contains 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
ericsnowcurrently
changed the title
gvanrossum
reviewed
Apr 12, 2024
Include/internal/pycore_typeobject.h
Outdated
| Those objects are stored in the PyInterpreterState.types.builtins | ||
| array, at the index corresponding to each specific static builtin | ||
| type. That index (a size_t value) is stored in the tp_subclasses | ||
| field (defined as PyObject*). We re-purposed the now-unused |
Objects/typeobject.c
Outdated
| @@ -163,7 +163,17 @@ static void | |||
| static_builtin_state_init(PyInterpreterState *interp, PyTypeObject *self) | |||
| { | |||
| if (!static_builtin_index_is_set(self)) { | |||
| static_builtin_index_set(self, interp->types.num_builtins_initialized); | |||
| assert(_Py_IsMainInterpreter(interp)); | |||
There was a problem hiding this comment.
In static_builtin_state_clear() there's a check for this rather than an assert. Maybe it should be an if here too, for symmetry? (Maybe the assert should be !static_builtin_index_is_set()?)
There was a problem hiding this comment.
Good point. I'll flip it around.
Objects/typeobject.c
Outdated
| @@ -163,7 +163,17 @@ static void | |||
| static_builtin_state_init(PyInterpreterState *interp, PyTypeObject *self) | |||
| { | |||
| if (!static_builtin_index_is_set(self)) { | |||
| static_builtin_index_set(self, interp->types.num_builtins_initialized); | |||
| assert(_Py_IsMainInterpreter(interp)); | |||
| assert(interp->types.num_builtins_initialized == \ | |||
There was a problem hiding this comment.
It's C. :-)
Suggested change
| assert(interp->types.num_builtins_initialized == \ | |
| assert(interp->types.num_builtins_initialized == |
Objects/typeobject.c
Outdated
| } | ||
| else { | ||
| assert(!_Py_IsMainInterpreter(interp)); | ||
| assert(static_builtin_index_get(self) == \ |
There was a problem hiding this comment.
Suggested change
| assert(static_builtin_index_get(self) == \ | |
| assert(static_builtin_index_get(self) == |
This reverts commit b8d622e.
Good point. I've dropped the extra counter. |
diegorusso
pushed a commit
to diegorusso/cpython
that referenced
this pull request
Apr 17, 2024
… Types (pythongh-117761) Guido pointed out to me that some details about the per-interpreter state for the builtin types aren't especially clear. I'm addressing that by: * adding a comment explaining that state * adding some asserts to point out the relationship between each index and the interp/global runtime state
|
After this PR, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Guido pointed out to me that some details about the per-interpreter state for the builtin types aren't especially clear. I'm addressing that by:
_PyRuntimeState.types.next_builtin_indexRegarding
next_builtin_index, it replaces our use of the main interpreter'sinterp->types.num_builtins_initializedas the next index. Even though it's technically redundant, the distinct global runtime field helps clarify explicitly that each index is from global state.