Skip to content

gh-76785: Add an Internal ExceptionSnapshot Type #111572

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 7 commits into from
Closed

gh-76785: Add an Internal ExceptionSnapshot Type #111572

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
177e4b1
Revert "gh-76785: Move _Py_excinfo Functions Out of the Internal C-AP…
ericsnowcurrently Nov 6, 2023
73e4918
Add the ExceptionSnapshot type.
ericsnowcurrently Sep 21, 2023
8041563
Use a custom type for ExceptionSnapshot, with new _excinfo & _error_c…
ericsnowcurrently Oct 5, 2023
8be52ae
Move ExceptionSnapshot to the interpeter state.
ericsnowcurrently Oct 24, 2023
5e9b17e
Add _PyXI_ResolveCapturedException().
ericsnowcurrently Oct 31, 2023
ce2db5d
Add _PyExc_FiniHeapObjects(), to call before _PyInterpreterState_Clea…
ericsnowcurrently Nov 1, 2023
b9f7974
Export fewer symbols.
ericsnowcurrently Nov 1, 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
Add the ExceptionSnapshot type.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 6, 2023
commit 73e49185ae43fc2b32b0c31a4fcf74b589bfadc8
23 changes: 23 additions & 0 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ add_new_exception(PyObject *mod, const char *name, PyObject *base)
/* module state *************************************************************/

typedef struct {
/* heap types */
PyTypeObject *ExceptionSnapshotType;

/* exceptions */
PyObject *RunFailedError;
} module_state;
Expand All @@ -67,6 +70,9 @@ get_module_state(PyObject *mod)
static int
traverse_module_state(module_state *state, visitproc visit, void *arg)
{
/* heap types */
Py_VISIT(state->ExceptionSnapshotType);

/* exceptions */
Py_VISIT(state->RunFailedError);

Expand All @@ -76,6 +82,9 @@ traverse_module_state(module_state *state, visitproc visit, void *arg)
static int
clear_module_state(module_state *state)
{
/* heap types */
Py_CLEAR(state->ExceptionSnapshotType);

/* exceptions */
Py_CLEAR(state->RunFailedError);

Expand Down Expand Up @@ -759,6 +768,11 @@ The 'interpreters' module provides a more convenient interface.");
static int
module_exec(PyObject *mod)
{
module_state *state = get_module_state(mod);
if (state == NULL) {
goto error;
}

/* Add exception types */
if (exceptions_init(mod) != 0) {
goto error;
Expand All @@ -769,6 +783,15 @@ module_exec(PyObject *mod)
goto error;
}

// ExceptionSnapshot
state->ExceptionSnapshotType = PyStructSequence_NewType(&exc_snapshot_desc);
if (state->ExceptionSnapshotType == NULL) {
goto error;
}
if (PyModule_AddType(mod, state->ExceptionSnapshotType) < 0) {
goto error;
}

return 0;

error:
Expand Down