bpo-43268: Pass interp rather than tstate to internal functions (GH-24580)

Pass the current interpreter (interp) rather than the current Python
thread state (tstate) to internal functions which only use the
interpreter.

Modified functions:

* _PyXXX_Fini() and _PyXXX_ClearFreeList() functions
* _PyEval_SignalAsyncExc(), make_pending_calls()
* _PySys_GetObject(), sys_set_object(), sys_set_object_id(), sys_set_object_str()
* should_audit(), set_flags_from_config(), make_flags()
* _PyAtExit_Call()
* init_stdio_encoding()
* etc.
This commit is contained in:
Victor Stinner 2021-02-19 15:10:45 +01:00 committed by GitHub
parent a486054b24
commit bcb094b41f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 240 additions and 245 deletions

View file

@ -15682,7 +15682,7 @@ PyTypeObject PyUnicode_Type = {
/* Initialize the Unicode implementation */
PyStatus
_PyUnicode_Init(PyThreadState *tstate)
_PyUnicode_Init(PyInterpreterState *interp)
{
/* XXX - move this array to unicodectype.c ? */
const Py_UCS2 linebreak[] = {
@ -15696,12 +15696,12 @@ _PyUnicode_Init(PyThreadState *tstate)
0x2029, /* PARAGRAPH SEPARATOR */
};
struct _Py_unicode_state *state = &tstate->interp->unicode;
struct _Py_unicode_state *state = &interp->unicode;
if (unicode_create_empty_string_singleton(state) < 0) {
return _PyStatus_NO_MEMORY();
}
if (_Py_IsMainInterpreter(tstate->interp)) {
if (_Py_IsMainInterpreter(interp)) {
/* initialize the linebreak bloom filter */
bloom_linebreak = make_bloom_mask(
PyUnicode_2BYTE_KIND, linebreak,
@ -15813,9 +15813,9 @@ PyUnicode_InternFromString(const char *cp)
void
_PyUnicode_ClearInterned(PyThreadState *tstate)
_PyUnicode_ClearInterned(PyInterpreterState *interp)
{
struct _Py_unicode_state *state = &tstate->interp->unicode;
struct _Py_unicode_state *state = &interp->unicode;
if (state->interned == NULL) {
return;
}
@ -16093,10 +16093,10 @@ error:
static PyStatus
init_stdio_encoding(PyThreadState *tstate)
init_stdio_encoding(PyInterpreterState *interp)
{
/* Update the stdio encoding to the normalized Python codec name. */
PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(tstate->interp);
PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp);
if (config_get_codec_name(&config->stdio_encoding) < 0) {
return _PyStatus_ERR("failed to get the Python codec name "
"of the stdio encoding");
@ -16189,7 +16189,7 @@ _PyUnicode_InitEncodings(PyThreadState *tstate)
return status;
}
return init_stdio_encoding(tstate);
return init_stdio_encoding(tstate->interp);
}
@ -16233,9 +16233,9 @@ _PyUnicode_EnableLegacyWindowsFSEncoding(void)
void
_PyUnicode_Fini(PyThreadState *tstate)
_PyUnicode_Fini(PyInterpreterState *interp)
{
struct _Py_unicode_state *state = &tstate->interp->unicode;
struct _Py_unicode_state *state = &interp->unicode;
// _PyUnicode_ClearInterned() must be called before
assert(state->interned == NULL);