Skip to content

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

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 18 commits into from
May 7, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a1a3b4c
Load extension modules under the main interpreter first.
ericsnowcurrently Feb 8, 2024
9d630f1
Tweak a comment.
ericsnowcurrently Apr 16, 2024
2d7ee11
Do not switch if already on the main interpreter.
ericsnowcurrently Apr 16, 2024
f9e132f
maybe_switch_to_main_interpreter() -> switch_to_main_interpreter()
ericsnowcurrently Apr 17, 2024
b09c445
Update the global cache while still under the main interpreter.
ericsnowcurrently May 6, 2024
8ca8033
Add a NEWS entry.
ericsnowcurrently May 6, 2024
122761c
Fix the main_tstate checks.
ericsnowcurrently May 6, 2024
bb3402a
Switch back if there is an exception.
ericsnowcurrently May 6, 2024
164a9eb
Cache the module only on success.
ericsnowcurrently May 6, 2024
0c74b25
Add a missing assert.
ericsnowcurrently May 6, 2024
7b9a29d
Clean up the temprary thread state.
ericsnowcurrently May 6, 2024
7965d57
Do not do an extra _Py_IsMainInterpreter() check.
ericsnowcurrently May 6, 2024
2abce96
Drop the superfluous SinglephaseInitTests.tearDownClass().
ericsnowcurrently May 6, 2024
0b16f3f
Work around a refleak.
ericsnowcurrently May 7, 2024
f7d0ff9
Skip some tests when the GIL is disabled.
ericsnowcurrently May 7, 2024
f3b015f
Merge branch 'main' into load-ext-in-main-interp-2
ericsnowcurrently May 7, 2024
048342f
Fix the tests.
ericsnowcurrently May 7, 2024
6d5311e
Disable all interpreters tests under Py_GIL_DISABLED.
ericsnowcurrently May 7, 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
Work around a refleak.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 7, 2024
commit 0b16f3fb21d3c328259afe100e9a0ab762c646a6
9 changes: 5 additions & 4 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,6 @@ init_cached_m_dict(struct extensions_cache_value *value, PyObject *m_dict)
return -1;
}
// XXX We may want to make the copy immortal.
// XXX This incref shouldn't be necessary. We are decref'ing
// one to many times somewhere.
Py_INCREF(copied);

value->_m_dict = (struct cached_m_dict){
.copied=copied,
Expand Down Expand Up @@ -1973,7 +1970,11 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
if (res.kind == _Py_ext_module_kind_SINGLEPHASE) {
/* Remember the filename as the __file__ attribute */
if (info->filename != NULL) {
if (PyModule_AddObjectRef(mod, "__file__", info->filename) < 0) {
// XXX There's a refleak somewhere with the filename.
// Until we can track it down, we intern it.
PyObject *filename = Py_NewRef(info->filename);
PyUnicode_InternInPlace(&filename);
if (PyModule_AddObjectRef(mod, "__file__", filename) < 0) {
PyErr_Clear(); /* Not important enough to report */
}
}
Expand Down