Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-94673: More Per-Interpreter Fields for Builtin Static Types #103912

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

Merged
ericsnowcurrently merged 13 commits into from
May 3, 2023
+185 −86
Merged

gh-94673: More Per-Interpreter Fields for Builtin Static Types #103912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d1e4cf5
Make __mro__ a getter.
ericsnowcurrently Apr 27, 2023
d3db6bf
Add the fields to static_builtin_state.
ericsnowcurrently Apr 27, 2023
b5799d8
Isolate tp_bases.
ericsnowcurrently Apr 27, 2023
2e28be5
Isolate tp_mro.
ericsnowcurrently Apr 27, 2023
fb7a025
Add a note.
ericsnowcurrently Apr 27, 2023
2822f0d
Isolate tp_dict.
ericsnowcurrently Apr 27, 2023
68f0008
Fix type_get_bases() and type_get_mro().
ericsnowcurrently Apr 27, 2023
de2a3c1
Fix _PyStaticType_InitBuiltin() for subinterpreters.
ericsnowcurrently Apr 27, 2023
8bd3b67
Call _PyType_CheckConsistency() after setting the fields.
ericsnowcurrently Apr 27, 2023
071ef3f
Re-run most of type_ready() under each interpreter.
ericsnowcurrently Apr 28, 2023
850059a
Add some comments.
ericsnowcurrently May 2, 2023
cd1dd10
Drop an old workaround for previously shared objects.
ericsnowcurrently May 2, 2023
2771f4e
Move Py_TPFLAGS_READYING to each interpreter for static builtin types.
ericsnowcurrently May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Isolate tp_dict.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 2, 2023
commit 2822f0d32f95ed9d22259a1fbed2d240daef39f6
9 changes: 2 additions & 7 deletions Objects/structseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,6 @@ _PyStructSequence_InitBuiltinWithFlags(PyInterpreterState *interp,
Py_ssize_t n_members = count_members(desc, &n_unnamed_members);
PyMemberDef *members = NULL;

int initialized = 1;
if ((type->tp_flags & Py_TPFLAGS_READY) == 0) {
assert(type->tp_name == NULL);
assert(type->tp_members == NULL);
Expand All @@ -524,7 +523,6 @@ _PyStructSequence_InitBuiltinWithFlags(PyInterpreterState *interp,
initialize_static_fields(type, desc, members, tp_flags);

_Py_SetImmortal(type);
initialized = 0;
}
#ifndef NDEBUG
else {
Expand All @@ -543,13 +541,10 @@ _PyStructSequence_InitBuiltinWithFlags(PyInterpreterState *interp,
desc->name);
goto error;
}
// This should be dropped if tp_dict is made per-interpreter.
if (initialized) {
return 0;
}

if (initialize_structseq_dict(
desc, _PyType_GetDict(type), n_members, n_unnamed_members) < 0) {
desc, _PyType_GetDict(type), n_members, n_unnamed_members) < 0)
{
goto error;
}

Expand Down
28 changes: 23 additions & 5 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ static_builtin_state_clear(PyInterpreterState *interp, PyTypeObject *self)
static inline PyObject *
lookup_tp_dict(PyTypeObject *self)
{
if (self->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
PyInterpreterState *interp = _PyInterpreterState_GET();
static_builtin_state *state = _PyStaticType_GetState(interp, self);
assert(state != NULL);
return state->tp_dict;
}
return self->tp_dict;
}

Expand All @@ -184,12 +190,26 @@ _PyType_GetDict(PyTypeObject *self)
static inline void
set_tp_dict(PyTypeObject *self, PyObject *dict)
{
if (self->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
PyInterpreterState *interp = _PyInterpreterState_GET();
static_builtin_state *state = _PyStaticType_GetState(interp, self);
assert(state != NULL);
state->tp_dict = dict;
return;
}
self->tp_dict = dict;
}

static inline void
clear_tp_dict(PyTypeObject *self)
{
if (self->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
PyInterpreterState *interp = _PyInterpreterState_GET();
static_builtin_state *state = _PyStaticType_GetState(interp, self);
assert(state != NULL);
Py_CLEAR(state->tp_dict);
return;
}
Py_CLEAR(self->tp_dict);
}

Expand Down Expand Up @@ -4738,13 +4758,11 @@ static void
clear_static_type_objects(PyInterpreterState *interp, PyTypeObject *type)
{
if (_Py_IsMainInterpreter(interp)) {
clear_tp_dict(type);
Py_CLEAR(type->tp_cache);
}
else {
clear_tp_bases(type);
clear_tp_mro(type);
}
clear_tp_dict(type);
clear_tp_bases(type);
clear_tp_mro(type);
clear_static_tp_subclasses(type);
}

Expand Down