Skip to content

gh-120161: Clean Up the Managed Static Types State #120663

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

Closed
ericsnowcurrently wants to merge 8 commits into from
Closed

gh-120161: Clean Up the Managed Static Types State #120663

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e3057ce
Clean up managed_static_type_state_init() a little.
ericsnowcurrently Jun 4, 2024
049934b
Track managed static types globally, with a shared index pool.
ericsnowcurrently Jun 4, 2024
1503e29
Unify the two per-interpreter structs.
ericsnowcurrently Jun 4, 2024
c820fdc
Add some asserts.
ericsnowcurrently Jun 13, 2024
de98b0f
wip - Do not reset a static type's index.
ericsnowcurrently Jun 6, 2024
bbfafd8
Small cleanup.
ericsnowcurrently Jun 17, 2024
2a30616
Drop an ifdef.
ericsnowcurrently Jun 17, 2024
6a20de3
Silence some compiler warnings.
ericsnowcurrently Jun 18, 2024
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
Next Next commit
Clean up managed_static_type_state_init() a little.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jun 17, 2024
commit e3057cec4880ee4600794628c2f4c4684761ee01
77 changes: 42 additions & 35 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,49 @@ managed_static_type_index_get(PyTypeObject *self)
return (size_t)self->tp_subclasses - 1;
}

static inline void
managed_static_type_index_set(PyTypeObject *self, size_t index)
static size_t
managed_static_type_index_init(PyInterpreterState *interp,
PyTypeObject *self, int isbuiltin)
{
assert(!managed_static_type_index_is_set(self));

size_t index;
if (isbuiltin) {
assert(_Py_IsMainInterpreter(interp));
index = interp->types.builtins.num_initialized;
assert(index < _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES);
interp->types.builtins.num_initialized++;
}
else {
PyMutex_Lock(&interp->types.mutex);
index = interp->types.for_extensions.next_index;
interp->types.for_extensions.next_index++;
interp->types.for_extensions.num_initialized++;
PyMutex_Unlock(&interp->types.mutex);
assert(index < _Py_MAX_MANAGED_STATIC_EXT_TYPES);
}

assert(index < _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES);
/* We store a 1-based index so 0 can mean "not initialized". */
self->tp_subclasses = (PyObject *)(index + 1);
return index;
}

static size_t
managed_static_type_index_sync(PyInterpreterState *interp,
PyTypeObject *self, int isbuiltin)
{
size_t index = managed_static_type_index_get(self);
if (isbuiltin) {
assert(index == interp->types.builtins.num_initialized);
assert(index < _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES);
interp->types.builtins.num_initialized++;
}
else {
assert(index < _Py_MAX_MANAGED_STATIC_EXT_TYPES);
interp->types.for_extensions.num_initialized++;
}
return index;
}

static inline void
Expand Down Expand Up @@ -214,32 +251,9 @@ managed_static_type_state_init(PyInterpreterState *interp, PyTypeObject *self,
{
assert(interp->runtime == &_PyRuntime);

size_t index;
if (initial) {
assert(!managed_static_type_index_is_set(self));
if (isbuiltin) {
index = interp->types.builtins.num_initialized;
assert(index < _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES);
}
else {
PyMutex_Lock(&interp->types.mutex);
index = interp->types.for_extensions.next_index;
interp->types.for_extensions.next_index++;
PyMutex_Unlock(&interp->types.mutex);
assert(index < _Py_MAX_MANAGED_STATIC_EXT_TYPES);
}
managed_static_type_index_set(self, index);
}
else {
index = managed_static_type_index_get(self);
if (isbuiltin) {
assert(index == interp->types.builtins.num_initialized);
assert(index < _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES);
}
else {
assert(index < _Py_MAX_MANAGED_STATIC_EXT_TYPES);
}
}
size_t index = initial
? managed_static_type_index_init(interp, self, isbuiltin)
: managed_static_type_index_sync(interp, self, isbuiltin);
size_t full_index = isbuiltin
? index
: index + _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES;
Expand Down Expand Up @@ -269,13 +283,6 @@ managed_static_type_state_init(PyInterpreterState *interp, PyTypeObject *self,
/* state->tp_subclasses is left NULL until init_subclasses() sets it. */
/* state->tp_weaklist is left NULL until insert_head() or insert_after()
(in weakrefobject.c) sets it. */

if (isbuiltin) {
interp->types.builtins.num_initialized++;
}
else {
interp->types.for_extensions.num_initialized++;
}
}

/* Reset the type's per-interpreter state.
Expand Down