mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
gh-116322: Add Py_mod_gil module slot (#116882)
This PR adds the ability to enable the GIL if it was disabled at interpreter startup, and modifies the multi-phase module initialization path to enable the GIL when loading a module, unless that module's spec includes a slot indicating it can run safely without the GIL. PEP 703 called the constant for the slot `Py_mod_gil_not_used`; I went with `Py_MOD_GIL_NOT_USED` for consistency with gh-104148. A warning will be issued up to once per interpreter for the first GIL-using module that is loaded. If `-v` is given, a shorter message will be printed to stderr every time a GIL-using module is loaded (including the first one that issues a warning).
This commit is contained in:
parent
3e818afb9b
commit
c2627d6eea
123 changed files with 376 additions and 62 deletions
|
@ -76,9 +76,13 @@ struct PyModuleDef_Slot {
|
|||
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030c0000
|
||||
# define Py_mod_multiple_interpreters 3
|
||||
#endif
|
||||
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030d0000
|
||||
# define Py_mod_gil 4
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef Py_LIMITED_API
|
||||
#define _Py_mod_LAST_SLOT 3
|
||||
#define _Py_mod_LAST_SLOT 4
|
||||
#endif
|
||||
|
||||
#endif /* New in 3.5 */
|
||||
|
@ -90,6 +94,16 @@ struct PyModuleDef_Slot {
|
|||
# define Py_MOD_PER_INTERPRETER_GIL_SUPPORTED ((void *)2)
|
||||
#endif
|
||||
|
||||
/* for Py_mod_gil: */
|
||||
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030d0000
|
||||
# define Py_MOD_GIL_USED ((void *)0)
|
||||
# define Py_MOD_GIL_NOT_USED ((void *)1)
|
||||
#endif
|
||||
|
||||
#if !defined(Py_LIMITED_API) && defined(Py_GIL_DISABLED)
|
||||
PyAPI_FUNC(int) PyModule_ExperimentalSetGIL(PyObject *module, void *gil);
|
||||
#endif
|
||||
|
||||
struct PyModuleDef {
|
||||
PyModuleDef_Base m_base;
|
||||
const char* m_name;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue