Skip to content

gh-104108: Add the Py_mod_multiple_interpreters Module Def Slot #104148

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 5, 2023
Merged

gh-104108: Add the Py_mod_multiple_interpreters Module Def Slot #104148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7afb005
Add the Py_mod_multiple_interpreters module def slot.
ericsnowcurrently May 2, 2023
d708985
Add constants for the Py_mod_multiple_interpreters value.
ericsnowcurrently May 3, 2023
8cb5a5a
Add a NEWS entry.
ericsnowcurrently May 3, 2023
340a469
Fix the flags.
ericsnowcurrently May 4, 2023
6e875bc
Fix the flags.
ericsnowcurrently May 4, 2023
338e255
Add a test.
ericsnowcurrently May 4, 2023
1148aba
Fix test_import.
ericsnowcurrently May 5, 2023
6069a1c
Resolve a warning.
ericsnowcurrently May 5, 2023
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
Add the Py_mod_multiple_interpreters module def slot.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 3, 2023
commit 7afb0050881e16d7b8e9f13622cb4621db916f9e
3 changes: 2 additions & 1 deletion Include/moduleobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ struct PyModuleDef_Slot {

#define Py_mod_create 1
#define Py_mod_exec 2
#define Py_mod_multiple_interpreters 3

#ifndef Py_LIMITED_API
#define _Py_mod_LAST_SLOT 2
#define _Py_mod_LAST_SLOT 3
#endif

#endif /* New in 3.5 */
Expand Down
28 changes: 28 additions & 0 deletions Objects/moduleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ PyModule_FromDefAndSpec2(PyModuleDef* def, PyObject *spec, int module_api_versio
PyObject *(*create)(PyObject *, PyModuleDef*) = NULL;
PyObject *nameobj;
PyObject *m = NULL;
Py_ssize_t multiple_interpreters = -1;
int has_execution_slots = 0;
const char *name;
int ret;
Expand Down Expand Up @@ -287,6 +288,16 @@ PyModule_FromDefAndSpec2(PyModuleDef* def, PyObject *spec, int module_api_versio
case Py_mod_exec:
has_execution_slots = 1;
break;
case Py_mod_multiple_interpreters:
if (multiple_interpreters >= 0) {
PyErr_Format(
PyExc_SystemError,
"module %s has more than one 'multiple interpreters' slots",
name);
goto error;
}
multiple_interpreters = (Py_ssize_t)cur_slot->value;
break;
default:
assert(cur_slot->slot < 0 || cur_slot->slot > _Py_mod_LAST_SLOT);
PyErr_Format(
Expand All @@ -297,6 +308,20 @@ PyModule_FromDefAndSpec2(PyModuleDef* def, PyObject *spec, int module_api_versio
}
}

/* By default, multi-phase init modules are expected
to work under multiple interpreters. */
if (multiple_interpreters < 0) {
multiple_interpreters = 1;
}
if (!multiple_interpreters) {
PyInterpreterState *interp = _PyInterpreterState_GET();
if (!_Py_IsMainInterpreter(interp)
&& _PyImport_CheckSubinterpIncompatibleExtensionAllowed(name) < 0)
{
goto error;
}
}

if (create) {
m = create(spec, def);
if (m == NULL) {
Expand Down Expand Up @@ -421,6 +446,9 @@ PyModule_ExecDef(PyObject *module, PyModuleDef *def)
return -1;
}
break;
case Py_mod_multiple_interpreters:
/* handled in PyModule_FromDefAndSpec2 */
break;
default:
PyErr_Format(
PyExc_SystemError,
Expand Down