8000 gh-117953: Split Up _PyImport_LoadDynamicModuleWithSpec() by ericsnowcurrently · Pull Request #118203 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-117953: Split Up _PyImport_LoadDynamicModuleWithSpec() #118203

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

gh-117953: Split Up _PyImport_LoadDynamicModuleWithSpec() #118203

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0163940
Factor out _PyImport_RunDynamicModule().
ericsnowcurrently Feb 8, 2024
e0ac947
Drop _PyImport_LoadDynamicModuleWithSpec().
ericsnowcurrently Feb 8, 2024
1fee8ca
Split up _PyImport_RunDynamicModule() along cross-interpreter-safe bo…
ericsnowcurrently Apr 16, 2024
a11eddb
Drop _PyImport_RunDynamicModule().
ericsnowcurrently Apr 23, 2024
daf7295
Factor out create_dynamic().
ericsnowcurrently Apr 16, 2024
3a5eba6
Drop _PyImport_FixupExtensionObject().
ericsnowcurrently Apr 16, 2024
2ab4bd8
Add some asserts to _PyImport_RunModInitFunc().
ericsnowcurrently Apr 18, 2024
9b39844
Check the module returned by import_find_extension() to ensure single…
ericsnowcurrently Apr 18, 2024
c253654
We already know the def is okay.
ericsnowcurrently Apr 19, 2024
8172748
Drop create_dynamic().
ericsnowcurrently Apr 23, 2024
4e72371
Update the comment about extensions.
ericsnowcurrently Apr 24, 2024
52f0656
Move setting m_init to _imp_create_dynamic_impl().
ericsnowcurrently Apr 24, 2024
a1d1258
Fix a refleak.
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
Drop create_dynamic().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 24, 2024
commit 8172748bb9a900c52624505de21689aa4f80b8fc
176 changes: 80 additions & 96 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,99 +1390,6 @@ clear_singlephase_extension(PyInterpreterState *interp,
return 0;
}

static PyObject *
create_dynamic(PyThreadState *tstate, struct _Py_ext_module_loader_info *info,
PyObject *file, PyObject *spec)
{
PyObject *mod = NULL;
PyModuleDef *def = NULL;

/* We would move this (and the fclose() below) into
* _PyImport_GetModInitFunc(), but it isn't clear if the intervening
* code relies on fp still being open. */
FILE *fp;
if (file != NULL) {
fp = _Py_fopen_obj(info->filename, "r");
if (fp == NULL) {
goto finally;
}
}
else {
fp = NULL;
}

PyModInitFunction p0 = _PyImport_GetModInitFunc(info, fp);
if (p0 == NULL) {
goto finally;
}

struct _Py_ext_module_loader_result res;
if (_PyImport_RunModInitFunc(p0, info, &res) < 0) {
assert(PyErr_Occurred());
goto finally;
}

mod = res.module;
res.module = NULL;
def = res.def;
assert(def != NULL);

if (mod == NULL) {
//assert(!is_singlephase(def));
mod = PyModule_FromDefAndSpec(def, spec);
if (mod == NULL) {
goto finally;
}
}
else {
assert(is_singlephase(def));
assert(!is_core_module(tstate->interp, info->name, info->filename));
assert(!is_core_module(tstate->interp, info->name, info->name));
mod = Py_NewRef(mod);

const char *name_buf = PyBytes_AS_STRING(info->name_encoded);
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
Py_CLEAR(mod);
goto finally;
}

/* Remember the filename as the __file__ attribute */
if (PyModule_AddObjectRef(mod, "__file__", info->filename) < 0) {
PyErr_Clear(); /* Not important enough to report */
}

struct singlephase_global_update singlephase = {0};
// gh-88216: Extensions and def->m_base.m_copy can be updated
// when the extension module doesn't support sub-interpreters.
if (def->m_size == -1) {
singlephase.m_dict = PyModule_GetDict(mod);
assert(singlephase.m_dict != NULL);
}
if (update_global_state_for_extension(
tstate, info->filename, info->name, def, &singlephase) < 0)
{
Py_CLEAR(mod);
goto finally;
}

PyObject *modules = get_modules_dict(tstate, true);
if (finish_singlephase_extension(
tstate, mod, def, info->name, modules) < 0)
{
Py_CLEAR(mod);
goto finally;
}
}

// XXX Shouldn't this happen in the error cases too.
if (fp) {
fclose(fp);
}

finally:
return mod;
}


/*******************/
/* builtin modules */
Expand Down Expand Up @@ -3957,6 +3864,7 @@ _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file)
/*[clinic end generated code: output=83249b827a4fde77 input=c31b954f4cf4e09d]*/
{
PyObject *mod = NULL;
PyModuleDef *def = NULL;
PyThreadState *tstate = _PyThreadState_GET();

struct _Py_ext_module_loader_info info;
Expand All @@ -3981,12 +3889,88 @@ _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file)
goto finally;
}

/* Is multi-phase init or this is the first time being loaded. */
mod = create_dynamic(tstate, &info, file, spec);
if (mod == NULL) {
/* We would move this (and the fclose() below) into
* _PyImport_GetModInitFunc(), but it isn't clear if the intervening
* code relies on fp still being open. */
FILE *fp;
if (file != NULL) {
fp = _Py_fopen_obj(info.filename, "r");
if (fp == NULL) {
goto finally;
}
}
else {
fp = NULL;
}

PyModInitFunction p0 = _PyImport_GetModInitFunc(&info, fp);
if (p0 == NULL) {
goto finally;
}

struct _Py_ext_module_loader_result res;
if (_PyImport_RunModInitFunc(p0, &info, &res) < 0) {
assert(PyErr_Occurred());
goto finally;
}

mod = res.module;
res.module = NULL;
def = res.def;
assert(def != NULL);

if (mod == NULL) {
//assert(!is_singlephase(def));
mod = PyModule_FromDefAndSpec(def, spec);
if (mod == NULL) {
goto finally;
}
}
else {
assert(is_singlephase(def));
assert(!is_core_module(tstate->interp, info.name, info.filename));
assert(!is_core_module(tstate->interp, info.name, info.name));
mod = Py_NewRef(mod);

const char *name_buf = PyBytes_AS_STRING(info.name_encoded);
if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
Py_CLEAR(mod);
goto finally;
}

/* Remember the filename as the __file__ attribute */
if (PyModule_AddObjectRef(mod, "__file__", info.filename) < 0) {
PyErr_Clear(); /* Not important enough to report */
}

struct singlephase_global_update singlephase = {0};
// gh-88216: Extensions and def->m_base.m_copy can be updated
// when the extension module doesn't support sub-interpreters.
if (def->m_size == -1) {
singlephase.m_dict = PyModule_GetDict(mod);
assert(singlephase.m_dict != NULL);
}
if (update_global_state_for_extension(
tstate, info.filename, info.name, def, &singlephase) < 0)
{
Py_CLEAR(mod);
goto finally;
}

PyObject *modules = get_modules_dict(tstate, true);
if (finish_singlephase_extension(
tstate, mod, def, info.name, modules) < 0)
{
Py_CLEAR(mod);
goto finally;
}
}

// XXX Shouldn't this happen in the error cases too.
if (fp) {
fclose(fp);
}

finally:
_Py_ext_module_loader_info_clear(&info);
return mod;
Expand Down
0