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

Skip to content

gh-117953: Always Run Extension Init Func in Main Interpreter First #117487

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

Closed
ericsnowcurrently wants to merge 6 commits into from
Closed

gh-117953: Always Run Extension Init Func in Main Interpreter First #117487

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
723c6fc
Factor out _PyImport_RunDynamicModule().
ericsnowcurrently Feb 8, 2024
c5bf024
Drop _PyImport_LoadDynamicModuleWithSpec().
ericsnowcurrently Feb 8, 2024
e9dfa14
Add an assert.
ericsnowcurrently Feb 8, 2024
3fa1035
Factor out fix_up_extension_for_interpreter().
ericsnowcurrently Feb 8, 2024
f103ccf
Do _extensions_cache_set() first.
ericsnowcurrently Feb 8, 2024
1405a59
Load extension modules under the main interpreter first.
ericsnowcurrently Feb 8, 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
Do _extensions_cache_set() first.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Apr 2, 2024
commit f103ccfbf1f2a61d464e64aadbd2d3c2030f8468
29 changes: 15 additions & 14 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,11 +639,11 @@ _PyImport_ClearModulesByIndex(PyInterpreterState *interp)
13. _PyImport_RunDynamicModule(): set __file__
14. _imp_create_dynamic_impl() -> _PyImport_CheckSubinterpIncompatibleExtensionAllowed()
15. _imp_create_dynamic_impl() -> fix_up_extension()
16. fix_up_extension() -> fix_up_extension_for_interpreter()
17. fix_up_extension_for_interpreter(): set it on sys.modules
18. fix_up_extension_for_interpreter(): add it to interp->imports.modules_by_index
19. fix_up_extension_for_interpreter(): copy __dict__ into def->m_base.m_copy
20. fix_up_extension(): add it to _PyRuntime.imports.extensions
16. fix_up_extension(): add it to _PyRuntime.imports.extensions
17. fix_up_extension() -> fix_up_extension_for_interpreter()
18. fix_up_extension_for_interpreter(): set it on sys.modules
19. fix_up_extension_for_interpreter(): add it to interp->imports.modules_by_index
20. fix_up_extension_for_interpreter(): copy __dict__ into def->m_base.m_copy

(6). subsequent times (found in _PyRuntime.imports.extensions):
1. _imp_create_dynamic_impl() -> import_find_extension()
Expand All @@ -662,11 +662,12 @@ _PyImport_ClearModulesByIndex(PyInterpreterState *interp)
...for single-phase init modules, where m_size >= 0:

(6). not main interpreter and never loaded there - every time (not found in _PyRuntime.imports.extensions):
1-16. (same as for m_size == -1)
1-20. (same as for m_size == -1)

(6). main interpreter - first time (not found in _PyRuntime.imports.extensions):
1-19. (same as for m_size == -1)
20. fix_up_extension(): add it to _PyRuntime.imports.extensions
1-15. (same as for m_size == -1)
16. fix_up_extension(): add it to _PyRuntime.imports.extensions
17-20. (same as for m_size == -1)

(6). previously loaded in main interpreter (found in _PyRuntime.imports.extensions):
1. _imp_create_dynamic_impl() -> import_find_extension()
Expand Down Expand Up @@ -1231,12 +1232,6 @@ fix_up_extension(PyObject *mod, PyModuleDef *def,
}
}

if (fix_up_extension_for_interpreter(
interp, mod, def, name, filename, modules) < 0)
{
return -1;
}

// XXX Why special-case the main interpreter?
if (_Py_IsMainInterpreter(interp) || def->m_size == -1) {
#ifndef NDEBUG
Expand All @@ -1248,6 +1243,12 @@ fix_up_extension(PyObject *mod, PyModuleDef *def,
}
}

if (fix_up_extension_for_interpreter(
interp, mod, def, name, filename, modules) < 0)
{
return -1;
}

return 0;
}

Expand Down