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
Merged

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

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
Re-run most of type_ready() under each interpreter.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 2, 2023
commit 071ef3f342fbba516b35df1a8f219dac10df2fb8
77 changes: 36 additions & 41 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7075,7 +7075,7 @@ type_ready_add_subclasses(PyTypeObject *type)
// Set tp_new and the "__new__" key in the type dictionary.
// Use the Py_TPFLAGS_DISALLOW_INSTANTIATION flag.
static int
type_ready_set_new(PyTypeObject *type)
type_ready_set_new(PyTypeObject *type, int rerunbuiltin)
{
PyTypeObject *base = type->tp_base;
/* The condition below could use some explanation.
Expand All @@ -7097,10 +7097,12 @@ type_ready_set_new(PyTypeObject *type)

if (!(type->tp_flags & Py_TPFLAGS_DISALLOW_INSTANTIATION)) {
if (type->tp_new != NULL) {
// If "__new__" key does not exists in the type dictionary,
// set it to tp_new_wrapper().
if (add_tp_new_wrapper(type) < 0) {
return -1;
if (!rerunbuiltin || base == NULL || type->tp_new != base->tp_new) {
// If "__new__" key does not exists in the type dictionary,
// set it to tp_new_wrapper().
if (add_tp_new_wrapper(type) < 0) {
return -1;
}
}
}
else {
Expand Down Expand Up @@ -7174,7 +7176,7 @@ type_ready_post_checks(PyTypeObject *type)


static int
type_ready(PyTypeObject *type)
type_ready(PyTypeObject *type, int rerunbuiltin)
{
_PyObject_ASSERT((PyObject *)type,
(type->tp_flags & Py_TPFLAGS_READYING) == 0);
Expand Down Expand Up @@ -7203,29 +7205,33 @@ type_ready(PyTypeObject *type)
if (type_ready_mro(type) < 0) {
goto error;
}
if (type_ready_set_new(type) < 0) {
if (type_ready_set_new(type, rerunbuiltin) < 0) {
goto error;
}
if (type_ready_fill_dict(type) < 0) {
goto error;
}
if (type_ready_inherit(type) < 0) {
goto error;
}
if (type_ready_preheader(type) < 0) {
goto error;
if (!rerunbuiltin) {
if (type_ready_inherit(type) < 0) {
goto error;
}
if (type_ready_preheader(type) < 0) {
goto error;
}
}
if (type_ready_set_hash(type) < 0) {
goto error;
}
if (type_ready_add_subclasses(type) < 0) {
goto error;
}
if (type_ready_managed_dict(type) < 0) {
goto error;
}
if (type_ready_post_checks(type) < 0) {
goto error;
if (!rerunbuiltin) {
if (type_ready_managed_dict(type) < 0) {
goto error;
}
if (type_ready_post_checks(type) < 0) {
goto error;
}
}

/* All done -- set the ready flag */
Expand Down Expand Up @@ -7253,7 +7259,7 @@ PyType_Ready(PyTypeObject *type)
type->tp_flags |= Py_TPFLAGS_IMMUTABLETYPE;
}

return type_ready(type);
return type_ready(type, 0);
}

int
Expand All @@ -7264,37 +7270,26 @@ _PyStaticType_InitBuiltin(PyInterpreterState *interp, PyTypeObject *self)
assert(!(self->tp_flags & Py_TPFLAGS_MANAGED_DICT));
assert(!(self->tp_flags & Py_TPFLAGS_MANAGED_WEAKREF));

#ifndef NDEBUG
int ismain = _Py_IsMainInterpreter(interp);
#endif
if (self->tp_flags & Py_TPFLAGS_READY) {
if ((self->tp_flags & Py_TPFLAGS_READY) == 0) {
assert(ismain);

self->tp_flags |= _Py_TPFLAGS_STATIC_BUILTIN;
self->tp_flags |= Py_TPFLAGS_IMMUTABLETYPE;

assert(NEXT_GLOBAL_VERSION_TAG <= _Py_MAX_GLOBAL_TYPE_VERSION_TAG);
self->tp_version_tag = NEXT_GLOBAL_VERSION_TAG++;
self->tp_flags |= Py_TPFLAGS_VALID_VERSION_TAG;
}
else {
assert(!ismain);
assert(self->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
assert(self->tp_flags & Py_TPFLAGS_VALID_VERSION_TAG);

static_builtin_state_init(interp, self);

/* We must explicitly set these for subinterpreters.
tp_subclasses is set lazily. */
type_ready_set_dict(self);
type_ready_set_bases(self);
type_ready_mro(self);
assert(_PyType_CheckConsistency(self));
return 0;
}

assert(ismain);

self->tp_flags |= _Py_TPFLAGS_STATIC_BUILTIN;
self->tp_flags |= Py_TPFLAGS_IMMUTABLETYPE;

assert(NEXT_GLOBAL_VERSION_TAG <= _Py_MAX_GLOBAL_TYPE_VERSION_TAG);
self->tp_version_tag = NEXT_GLOBAL_VERSION_TAG++;
self->tp_flags |= Py_TPFLAGS_VALID_VERSION_TAG;

static_builtin_state_init(interp, self);

int res = type_ready(self);
int res = type_ready(self, !ismain);
if (res < 0) {
static_builtin_state_clear(interp, self);
}
Expand Down