mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-46008: Make runtime-global object/type lifecycle functions and state consistent. (gh-29998)

Browse source 
This change is strictly renames and moving code around.  It helps in the following ways:

* ensures type-related init functions focus strictly on one of the three aspects (state, objects, types)
* passes in PyInterpreterState * to all those functions, simplifying work on moving types/objects/state to the interpreter
* consistent naming conventions help make what's going on more clear
* keeping API related to a type in the corresponding header file makes it more obvious where to look for it

https://bugs.python.org/issue46008
This commit is contained in:
Eric Snow 2021-12-09 12:59:26 -07:00 • committed by GitHub
parent d8a464ef03
commit c8749b5783
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 818 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/context.c
View file

@ -3,6 +3,7 @@
#include "pycore_context.h"
#include "pycore_gc.h" // _PyObject_GC_MAY_BE_TRACKED()
#include "pycore_hamt.h"
#include "pycore_initconfig.h" // _PyStatus_OK()
#include "pycore_object.h"
#include "pycore_pyerrors.h"
#include "pycore_pystate.h" // _PyThreadState_GET()
@ -1317,15 +1318,20 @@ _PyContext_Fini(PyInterpreterState *interp)
struct _Py_context_state *state = &interp->context;
state->numfree = -1;
#endif
_PyHamt_Fini();
_PyHamt_Fini(interp);
}
int
_PyContext_Init(void)
PyStatus
_PyContext_InitTypes(PyInterpreterState *interp)
{
if (!_PyHamt_Init()) {
return 0;
if (!_Py_IsMainInterpreter(interp)) {
return _PyStatus_OK();
}
PyStatus status = _PyHamt_InitTypes(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
if ((PyType_Ready(&PyContext_Type) < 0) ||
@ -1333,7 +1339,7 @@ _PyContext_Init(void)
(PyType_Ready(&PyContextToken_Type) < 0) ||
(PyType_Ready(&PyContextTokenMissing_Type) < 0))
{
return 0;
return _PyStatus_ERR("can't init context types");
}
PyObject *missing = get_token_missing();
@ -1341,9 +1347,9 @@ _PyContext_Init(void)
PyContextToken_Type.tp_dict, "MISSING", missing))
{
Py_DECREF(missing);
return 0;
return _PyStatus_ERR("can't init context types");
}
Py_DECREF(missing);
return 1;
return _PyStatus_OK();
}