8000 gh-99741: Clean Up the _xxsubinterpreters Module by ericsnowcurrently · Pull Request #99940 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-99741: Clean Up the _xxsubinterpreters Module #99940

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 18 commits into from
Dec 2, 2022
Merged

gh-99741: Clean Up the _xxsubinterpreters Module #99940

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3fa77fb
Use a C11 struct initializer.
ericsnowcurrently Nov 21, 2022
f2f00aa
Clean up PyInit__xxsubinterpreters().
ericsnowcurrently Nov 21, 2022
bb84f38
Clean up channel_exceptions_init() and interp_exceptions_init().
ericsnowcurrently Nov 21, 2022
45e1f25
Add _globals_fini() and only do init/fini once.
ericsnowcurrently Nov 22, 2022
0efa456
Factor out module_exec().
ericsnowcurrently Nov 22, 2022
bd841f2
Fix add_new_exception().
ericsnowcurrently Nov 23, 2022
36e1239
Do not rely on exception globals in low-level functions.
ericsnowcurrently Nov 22, 2022
51645f7
Import _xxsubinterpreters in a subinterpreter if necessary.
ericsnowcurrently Nov 22, 2022
db57245
Ensure that the XID data gets released.
ericsnowcurrently Dec 1, 2022
4f9baf0
Return an error code from _PyCrossInterpreterData_Release().
ericsnowcurrently Nov 29, 2022
27d9b35
Clean up for ChannelIDType.
ericsnowcurrently Nov 23, 2022
c4aa646
Always decrement _globals.module_count.
ericsnowcurrently Nov 28, 2022
5cb73fa
Decref the module when appropriate.
ericsnowcurrently Nov 29, 2022
5af58e8
Add some asserts.
ericsnowcurrently Nov 29, 2022
f555fbe
Clear the registered type during module cleanup.
ericsnowcurrently Nov 30, 2022
ad000ad
Add a dedicated ChannelIDTests.test_shareable().
ericsnowcurrently Dec 1, 2022
60a78ab
Add a TODO comment.
ericsnowcurrently Dec 1, 2022
012d61c
Update a TODO comment.
ericsnowcurrently Dec 1, 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
Import _xxsubinterpreters in a subinterpreter if necessary.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Dec 2, 2022
commit 51645f773800c06a1108344a4456a575ba4d7ec6
40 changes: 30 additions & 10 deletions Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ _get_current_interp(void)
static PyObject *
_get_current_module(void)
{
// It might not have been imported yet in the current interpreter.
// However, it will (almost) always have been imported already
// in the main interpreter.
// XXX Do the import in _sharedns_apply()
// and use PyImport_GetModule() here instead.
PyObject *mod = PyImport_ImportModule(MODULE_NAME);
// We ensured it was imported in _run_script().
PyObject *name = PyUnicode_FromString(MODULE_NAME);
if (name == NULL) {
return NULL;
}
PyObject *mod = PyImport_GetModule(name);
Py_DECREF(name);
if (mod == NULL) {
return NULL;
}
Expand Down Expand Up @@ -180,9 +181,12 @@ _sharedns_free(_sharedns *shared)
PyMem_Free(shared);
}

static PyTypeObject ChannelIDtype;

static _sharedns *
_get_shared_ns(PyObject *shareable)
_get_shared_ns(PyObject *shareable, int *needs_import)
{
*needs_import = 0;
if (shareable == NULL || shareable == Py_None) {
return NULL;
}
Expand All @@ -204,6 +208,9 @@ _get_shared_ns(PyObject *shareable)
if (_sharednsitem_init(&shared->items[i], key, value) != 0) {
break;
}
if (Py_TYPE(value) == &ChannelIDtype) {
*needs_import = 1;
}
}
if (PyErr_Occurred()) {
_sharedns_free(shared);
Expand Down Expand Up @@ -2021,12 +2028,24 @@ _ensure_not_running(PyInterpreterState *interp)

static int
_run_script(PyInterpreterState *interp, const char *codestr,
_sharedns *shared, _sharedexception **exc)
_sharedns *shared, int needs_import,
_sharedexception **exc)
{
PyObject *exctype = NULL;
PyObject *excval = NULL;
PyObject *tb = NULL;

if (needs_import) {
// It might not have been imported yet in the current interpreter.
// However, it will (almost) always have been imported already
// in the main interpreter.
PyObject *mod = PyImport_ImportModule(MODULE_NAME);
if (mod == NULL) {
goto error;
}
Py_DECREF(mod);
}

PyObject *main_mod = _PyInterpreterState_GetMainModule(interp);
if (main_mod == NULL) {
goto error;
Expand Down Expand Up @@ -2086,7 +2105,8 @@ _run_script_in_interpreter(PyObject *mod, PyInterpreterState *interp,
return -1;
}

_sharedns *shared = _get_shared_ns(shareables);
int needs_import = 0;
_sharedns *shared = _get_shared_ns(shareables, &needs_import);
if (shared == NULL && PyErr_Occurred()) {
return -1;
}
Expand All @@ -2102,7 +2122,7 @@ _run_script_in_interpreter(PyObject *mod, PyInterpreterState *interp,

// Run the script.
_sharedexception *exc = NULL;
int result = _run_script(interp, codestr, shared, &exc);
int result = _run_script(interp, codestr, shared, needs_import, &exc);

// Switch back.
if (save_tstate != NULL) {
Expand Down
0