Skip to content

gh-76785: Minor Cleanup of Exception-related Cross-interpreter State #126602

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 3 commits into from
Nov 11, 2024
Merged

gh-76785: Minor Cleanup of Exception-related Cross-interpreter State #126602

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e45408d
Clean up if init_exceptions() fails.
ericsnowcurrently Nov 7, 2024
7b665a6
Initialize heap types in init_exceptions().
ericsnowcurrently Nov 7, 2024
e5e0a6c
Add _PyXI_state_t.exceptions, init_static_exctypes(), fini_static_exc…
ericsnowcurrently Nov 7, 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 if init_exceptions() fails.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 7, 2024
commit e45408d26224d58d8fcfe8537a29ab140c834c8d
22 changes: 17 additions & 5 deletions Python/crossinterp_exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,41 @@ _get_not_shareable_error_type(PyInterpreterState *interp)
static int
init_exceptions(PyInterpreterState *interp)
{
// Initialize static types.
int base_initialized = 0;
int notfound_initialized = 0;
PyTypeObject *base = (PyTypeObject *)PyExc_Exception;

// builtin static types

_PyExc_InterpreterError.tp_base = base;
_PyExc_InterpreterError.tp_traverse = base->tp_traverse;
_PyExc_InterpreterError.tp_clear = base->tp_clear;
if (_PyStaticType_InitBuiltin(interp, &_PyExc_InterpreterError) < 0) {
return -1;
goto error;
}
base_initialized = 1;

_PyExc_InterpreterNotFoundError.tp_traverse = base->tp_traverse;
_PyExc_InterpreterNotFoundError.tp_clear = base->tp_clear;
if (_PyStaticType_InitBuiltin(interp, &_PyExc_InterpreterNotFoundError) < 0) {
return -1;
goto error;
}
notfound_initialized = 1;

// heap types
// Initialize heap types.

// We would call _init_not_shareable_error_type() here too,
// but that leads to ref leaks

return 0;

error:
if (base_initialized) {
_PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterError);
}
if (notfound_initialized) {
_PyStaticType_FiniBuiltin(interp, &_PyExc_InterpreterNotFoundError);
}
return -1;
}

static void
Expand Down