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

Skip to content

gh-99741: Implement Multi-Phase Init for the _xxsubinterpreters Module #99742

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
merged 10 commits into from
Dec 5, 2022
Merged

gh-99741: Implement Multi-Phase Init for the _xxsubinterpreters Module #99742

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bd7ee33
Add _PyCrossInterpreterData_Init() and _PyCrossInterpreterData_Clear().
ericsnowcurrently Dec 2, 2022
0bfe7b5
Clear channels before interpreters.
ericsnowcurrently Dec 2, 2022
6932dc7
Add a test for importing the module in a subinterpreter.
ericsnowcurrently Dec 5, 2022
fe3fd40
Add module state.
ericsnowcurrently Nov 21, 2022
8c976d6
fix _str_shared()
ericsnowcurrently Dec 2, 2022
8a50e87
Move the exceptions to module state.
ericsnowcurrently Nov 23, 2022
89e3ecc
Drop the globals for the error types.
ericsnowcurrently Nov 22, 2022
2540946
Make ChannelIDType a heap type.
ericsnowcurrently Nov 23, 2022
98c240a
Switch to multi-phase init.
ericsnowcurrently Nov 21, 2022
9d388e7
Add a NEWS entry.
ericsnowcurrently Nov 24, 2022
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
Move the exceptions to module state.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Dec 5, 2022
commit 8a50e878486c2cf0288619e7ebc2192779fff31b
58 changes: 47 additions & 11 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,15 @@ _release_xid_data(_PyCrossInterpreterData *data, int ignoreexc)
/* module state *************************************************************/

typedef struct {
int _not_used;
/* interpreter exceptions */
PyObject *RunFailedError;

/* channel exceptions */
PyObject *ChannelError;
PyObject *ChannelNotFoundError;
PyObject *ChannelClosedError;
PyObject *ChannelEmptyError;
PyObject *ChannelNotEmptyError;
} module_state;

static inline module_state *
Expand All @@ -165,12 +173,30 @@ get_module_state(PyObject *mod)
static int
traverse_module_state(module_state *state, visitproc visit, void *arg)
{
/* interpreter exceptions */
Py_VISIT(state->RunFailedError);

/* channel exceptions */
Py_VISIT(state->ChannelError);
Py_VISIT(state->ChannelNotFoundError);
Py_VISIT(state->ChannelClosedError);
Py_VISIT(state->ChannelEmptyError);
Py_VISIT(state->ChannelNotEmptyError);
return 0;
}

static int
clear_module_state(module_state *state)
{
/* interpreter exceptions */
Py_CLEAR(state->RunFailedError);

/* channel exceptions */
Py_CLEAR(state->ChannelError);
Py_CLEAR(state->ChannelNotFoundError);
Py_CLEAR(state->ChannelClosedError);
Py_CLEAR(state->ChannelEmptyError);
Py_CLEAR(state->ChannelNotEmptyError);
return 0;
}

Expand Down Expand Up @@ -451,15 +477,20 @@ static PyObject *ChannelNotEmptyError;
static int
channel_exceptions_init(PyObject *mod)
{
// XXX Move the exceptions into per-module memory?
module_state *state = get_module_state(mod);
if (state == NULL) {
return -1;
}

#define ADD(NAME, BASE) \
do { \
assert(state->NAME == NULL); \
state->NAME = ADD_NEW_EXCEPTION(mod, NAME, BASE); \
if (state->NAME == NULL) { \
return -1; \
} \
if (NAME == NULL) { \
NAME = ADD_NEW_EXCEPTION(mod, NAME, BASE); \
if (NAME == NULL) { \
return -1; \
} \
NAME = Py_NewRef(state->NAME); \
} \
} while (0)

Expand Down Expand Up @@ -2060,15 +2091,20 @@ static PyObject * RunFailedError = NULL;
static int
interp_exceptions_init(PyObject *mod)
{
// XXX Move the exceptions into per-module memory?
module_state *state = get_module_state(mod);
if (state == NULL) {
return -1;
}

#define ADD(NAME, BASE) \
do { \
assert(state->NAME == NULL); \
state->NAME = ADD_NEW_EXCEPTION(mod, NAME, BASE); \
if (state->NAME == NULL) { \
return -1; \
} \
if (NAME == NULL) { \
NAME = ADD_NEW_EXCEPTION(mod, NAME, BASE); \
if (NAME == NULL) { \
return -1; \
} \
NAME = Py_NewRef(state->NAME); \
} \
} while (0)

Expand Down