Skip to content

gh-117953: Share More Machinery Code Between Builtin and Dynamic Extensions #118204

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 5 commits into from
Apr 29, 2024
Merged

gh-117953: Share More Machinery Code Between Builtin and Dynamic Extensions #118204

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b88c403
Use _PyImport_RunModInitFunc() in create_builtin().
ericsnowcurrently Apr 18, 2024
21d259e
Allow mod->md_def to be NULL.
ericsnowcurrently Apr 19, 2024
5756201
Call _PyImport_RunModInitFunc() in reload_singlephase_extension().
ericsnowcurrently Apr 19, 2024
b932173
Factor out import_run_extension().
ericsnowcurrently Apr 18, 2024
c897f6a
Update the comment about extensions.
ericsnowcurrently Apr 24, 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
Prev Previous commit
Next Next commit
Allow mod->md_def to be NULL.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 29, 2024
commit 21d259e0f2c9c64fa08a77852cb456bb8b38ef8d
21 changes: 21 additions & 0 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,20 @@ update_global_state_for_extension(PyThreadState *tstate,
assert(!is_core_module(tstate->interp, name, path));
assert(PyUnicode_CompareWithASCIIString(name, "sys") != 0);
assert(PyUnicode_CompareWithASCIIString(name, "builtins") != 0);
/* XXX gh-88216: The copied dict is owned by the current
* interpreter. That's a problem if the interpreter has
* its own obmalloc state or if the module is successfully
* imported into such an interpreter. If the interpreter
* has its own GIL then there may be data races and
* PyImport_ClearModulesByIndex() can crash. Normally,
* a single-phase init module cannot be imported in an
* isolated interpreter, but there are ways around that.
* Hence, heere be dragons! Ideally we would instead do
* something like make a read-only, immortal copy of the
* dict using PyMem_RawMalloc() and store *that* in m_copy.
* Then we'd need to make sure to clear that when the
* runtime is finalized, rather than in
* PyImport_ClearModulesByIndex(). */
if (def->m_base.m_copy) {
/* Somebody already imported the module,
likely under a different name.
Expand Down Expand Up @@ -1337,6 +1351,13 @@ import_find_extension(PyThreadState *tstate,
Py_DECREF(mod);
return NULL;
}
/* We can't set mod->md_def if it's missing,
* because _PyImport_ClearModulesByIndex() might break
* due to violating interpreter isolation. See the note
* in fix_up_extension_for_interpreter(). Until that
* is solved, we leave md_def set to NULL. */
assert(_PyModule_GetDef(mod) == NULL
|| _PyModule_GetDef(mod) == def);
}
else {
if (def->m_base.m_init == NULL)
Expand Down