mirror of
https://github.com/python/cpython.git
synced 2025-07-25 12:14:38 +00:00
81c72044a1
We're no longer using _Py_IDENTIFIER() (or _Py_static_string()) in any core CPython code. It is still used in a number of non-builtin stdlib modules. The replacement is: PyUnicodeObject (not pointer) fields under _PyRuntimeState, statically initialized as part of _PyRuntime. A new _Py_GET_GLOBAL_IDENTIFIER() macro facilitates lookup of the fields (along with _Py_GET_GLOBAL_STRING() for non-identifier strings). https://bugs.python.org/issue46541#msg411799 explains the rationale for this change. The core of the change is in: * (new) Include/internal/pycore_global_strings.h - the declarations for the global strings, along with the macros * Include/internal/pycore_runtime_init.h - added the static initializers for the global strings * Include/internal/pycore_global_objects.h - where the struct in pycore_global_strings.h is hooked into _PyRuntimeState * Tools/scripts/generate_global_objects.py - added generation of the global string declarations and static initializers I've also added a --check flag to generate_global_objects.py (along with make check-global-objects) to check for unused global strings. That check is added to the PR CI config. The remainder of this change updates the core code to use _Py_GET_GLOBAL_IDENTIFIER() instead of _Py_IDENTIFIER() and the related _Py*Id functions (likewise for _Py_GET_GLOBAL_STRING() instead of _Py_static_string()). This includes adding a few functions where there wasn't already an alternative to _Py*Id(), replacing the _Py_Identifier * parameter with PyObject *. The following are not changed (yet): * stop using _Py_IDENTIFIER() in the stdlib modules * (maybe) get rid of _Py_IDENTIFIER(), etc. entirely -- this may not be doable as at least one package on PyPI using this (private) API * (maybe) intern the strings during runtime init https://bugs.python.org/issue46541
50 lines
1.3 KiB
C
50 lines
1.3 KiB
C
#ifndef Py_INTERNAL_GLOBAL_OBJECTS_H
|
|
#define Py_INTERNAL_GLOBAL_OBJECTS_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef Py_BUILD_CORE
|
|
# error "this header requires Py_BUILD_CORE define"
|
|
#endif
|
|
|
|
#include "pycore_global_strings.h" // struct _Py_global_strings
|
|
|
|
|
|
// These would be in pycore_long.h if it weren't for an include cycle.
|
|
#define _PY_NSMALLPOSINTS 257
|
|
#define _PY_NSMALLNEGINTS 5
|
|
|
|
|
|
// Only immutable objects should be considered runtime-global.
|
|
// All others must be per-interpreter.
|
|
|
|
#define _Py_GLOBAL_OBJECT(NAME) \
|
|
_PyRuntime.global_objects.NAME
|
|
#define _Py_SINGLETON(NAME) \
|
|
_Py_GLOBAL_OBJECT(singletons.NAME)
|
|
|
|
struct _Py_global_objects {
|
|
struct {
|
|
/* Small integers are preallocated in this array so that they
|
|
* can be shared.
|
|
* The integers that are preallocated are those in the range
|
|
* -_PY_NSMALLNEGINTS (inclusive) to _PY_NSMALLPOSINTS (exclusive).
|
|
*/
|
|
PyLongObject small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS];
|
|
|
|
PyBytesObject bytes_empty;
|
|
struct {
|
|
PyBytesObject ob;
|
|
char eos;
|
|
} bytes_characters[256];
|
|
|
|
struct _Py_global_strings strings;
|
|
} singletons;
|
|
};
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_INTERNAL_GLOBAL_OBJECTS_H */
|