Skip to content

gh-117953: Other Cleanups in the Extensions Machinery #118206

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 8 commits into from
May 3, 2024
+410 −102
Merged

gh-117953: Other Cleanups in the Extensions Machinery #118206

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eff78d5
Factor out reload_singlephase_extension().
ericsnowcurrently Apr 17, 2024
b141aa1
Update the comment about extensions.
ericsnowcurrently Apr 29, 2024
bd8bf58
Factor out _extensions_cache_init().
ericsnowcurrently Apr 17, 2024
a228e21
Factor out _extensions_cache_find_unlocked().
ericsnowcurrently Apr 17, 2024
fa68228
Drop the replace arg to _extensions_cache_set().
ericsnowcurrently Apr 18, 2024
f740a6c
filename -> path
ericsnowcurrently May 1, 2024
d59a95e
Add notes about the _testsinglephase module.
ericsnowcurrently May 2, 2024
83f3142
Fix some comments.
ericsnowcurrently May 2, 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
Factor out reload_singlephase_extension().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 1, 2024
commit eff78d5e635b2536a18ae3cf455560c26b6a55d3
45 changes: 35 additions & 10 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,15 +1359,11 @@ finish_singlephase_extension(PyThreadState *tstate,


static PyObject *
import_find_extension(PyThreadState *tstate,
struct _Py_ext_module_loader_info *info)
reload_singlephase_extension(PyThreadState *tstate, PyModuleDef *def,
struct _Py_ext_module_loader_info *info)
{
/* Only single-phase init modules will be in the cache. */
PyModuleDef *def = _extensions_cache_get(info->path, info->name);
if (def == NULL) {
return NULL;
}
assert_singlephase(def);
PyObject *mod = NULL;

/* It may have been successfully imported previously
in an interpreter that allows legacy modules
Expand All @@ -1378,9 +1374,7 @@ import_find_extension(PyThreadState *tstate,
return NULL;
}

PyObject *mod, *mdict;
PyObject *modules = get_modules_dict(tstate, true);

if (def->m_size == -1) {
PyObject *m_copy = def->m_base.m_copy;
/* Module does not support repeated initialization */
Expand All @@ -1390,14 +1384,15 @@ import_find_extension(PyThreadState *tstate,
m_copy = get_core_module_dict(
tstate->interp, info->name, info->path);
if (m_copy == NULL) {
assert(!PyErr_Occurred());
return NULL;
}
}
mod = import_add_module(tstate, info->name);
if (mod == NULL) {
return NULL;
}
mdict = PyModule_GetDict(mod);
PyObject *mdict = PyModule_GetDict(mod);
if (mdict == NULL) {
Py_DECREF(mod);
return NULL;
Expand All @@ -1416,6 +1411,7 @@ import_find_extension(PyThreadState *tstate,
}
else {
if (def->m_base.m_init == NULL) {
assert(!PyErr_Occurred());
return NULL;
}
struct _Py_ext_module_loader_result res;
Expand Down Expand Up @@ -1445,12 +1441,41 @@ import_find_extension(PyThreadState *tstate,
return NULL;
}
}

if (_modules_by_index_set(tstate->interp, def, mod) < 0) {
PyMapping_DelItem(modules, info->name);
Py_DECREF(mod);
return NULL;
}

return mod;
}

static PyObject *
import_find_extension(PyThreadState *tstate,
struct _Py_ext_module_loader_info *info)
{
/* Only single-phase init modules will be in the cache. */
PyModuleDef *def = _extensions_cache_get(info->path, info->name);
if (def == NULL) {
return NULL;
}
assert_singlephase(def);

/* It may have been successfully imported previously
in an interpreter that allows legacy modules
but is not allowed in the current interpreter. */
const char *name_buf = PyUnicode_AsUTF8(info->name);
assert(name_buf != NULL);
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
return NULL;
}

PyObject *mod = reload_singlephase_extension(tstate, def, info);
if (mod == NULL) {
return NULL;
}

int verbose = _PyInterpreterState_GetConfig(tstate->interp)->verbose;
if (verbose) {
PySys_FormatStderr("import %U # previously loaded (%R)\n",
Expand Down