mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

gh-94673: Isolate the _io module to Each Interpreter (gh-102663)

Browse source 
Aside from sys and builtins, _io is the only core builtin module that hasn't been ported to multi-phase init.  We may do so later (e.g. gh-101948), but in the meantime we must at least take care of the module's static types properly.  (This came up while working on gh-101660.)

https://github.com/python/cpython/issues/94673
This commit is contained in:
Eric Snow 2023-03-21 14:01:38 -06:00 • committed by GitHub
parent 8d015fa000
commit e6ecd3e6b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Modules/_io/_iomodule.c
View file

@ -11,6 +11,7 @@
#include "Python.h" #include "Python.h"
#include "_iomodule.h" #include "_iomodule.h"
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_initconfig.h" // _PyStatus_OK()
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
@ -666,12 +667,40 @@ static PyTypeObject* static_types[] = {
}; };
void PyStatus
_PyIO_Fini(void) _PyIO_InitTypes(PyInterpreterState *interp)
{ {
if (!_Py_IsMainInterpreter(interp)) {
return _PyStatus_OK();
}
// Set type base classes
#ifdef HAVE_WINDOWS_CONSOLE_IO
PyWindowsConsoleIO_Type.tp_base = &PyRawIOBase_Type;
#endif
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
PyTypeObject *type = static_types[i];
if (_PyStaticType_InitBuiltin(type) < 0) {
return _PyStatus_ERR("Can't initialize builtin type");
}
}
return _PyStatus_OK();
}
void
_PyIO_FiniTypes(PyInterpreterState *interp)
{
if (!_Py_IsMainInterpreter(interp)) {
return;
}
// Deallocate types in the reverse order to deallocate subclasses before
// their base classes.
for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types) - 1; i >= 0; i--) { for (Py_ssize_t i=Py_ARRAY_LENGTH(static_types) - 1; i >= 0; i--) {
PyTypeObject *exc = static_types[i]; PyTypeObject *type = static_types[i];
_PyStaticType_Dealloc(exc); _PyStaticType_Dealloc(type);
} }
} }
@ -717,11 +746,6 @@ PyInit__io(void)
goto fail; goto fail;
} }
// Set type base classes
#ifdef HAVE_WINDOWS_CONSOLE_IO
PyWindowsConsoleIO_Type.tp_base = &PyRawIOBase_Type;
#endif
// Add types // Add types
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) { for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
PyTypeObject *type = static_types[i]; PyTypeObject *type = static_types[i];

12
Python/pylifecycle.c
View file

@ -31,7 +31,8 @@
#include "pycore_unicodeobject.h" // _PyUnicode_InitTypes() #include "pycore_unicodeobject.h" // _PyUnicode_InitTypes()
#include "opcode.h" #include "opcode.h"
extern void _PyIO_Fini(void); extern PyStatus _PyIO_InitTypes(PyInterpreterState *interp);
extern void _PyIO_FiniTypes(PyInterpreterState *interp);
#include <locale.h> // setlocale() #include <locale.h> // setlocale()
#include <stdlib.h> // getenv() #include <stdlib.h> // getenv()
@ -697,6 +698,11 @@ pycore_init_types(PyInterpreterState *interp)
return _PyStatus_ERR("failed to initialize an exception type"); return _PyStatus_ERR("failed to initialize an exception type");
} }
status = _PyIO_InitTypes(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
status = _PyExc_InitGlobalObjects(interp); status = _PyExc_InitGlobalObjects(interp);
if (_PyStatus_EXCEPTION(status)) { if (_PyStatus_EXCEPTION(status)) {
return status; return status;
@ -1700,9 +1706,7 @@ finalize_interp_clear(PyThreadState *tstate)
/* Clear interpreter state and all thread states */ /* Clear interpreter state and all thread states */
_PyInterpreterState_Clear(tstate); _PyInterpreterState_Clear(tstate);
if (is_main_interp) { _PyIO_FiniTypes(tstate->interp);
_PyIO_Fini();
}
/* Clear all loghooks */ /* Clear all loghooks */
/* Both _PySys_Audit function and users still need PyObject, such as tuple. /* Both _PySys_Audit function and users still need PyObject, such as tuple.