Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-45953: Statically initialize the small ints. (gh-30092) 

The array of small PyLong objects has been statically declared. Here I also statically initialize them. Consequently they are no longer initialized dynamically during runtime init.

I've also moved them under a new sub-struct in _PyRuntimeState, in preparation for static allocation and initialization of other global objects.

https://bugs.python.org/issue45953
This commit is contained in:
Eric Snow 2021-12-13 18:04:05 -07:00 committed by GitHub
parent cb589d1b6b
commit 121f1f893a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 360 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

337
Include/internal/pycore_global_objects.h Normal file
View File

@ -0,0 +1,337 @@
#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
#define _PyObject_IMMORTAL_INIT(type) \
{ \
.ob_refcnt = 999999999, \
.ob_type = type, \
}
#define _PyVarObject_IMMORTAL_INIT(type, size) \
{ \
.ob_base = _PyObject_IMMORTAL_INIT(type), \
.ob_size = size, \
}
/* int objects */
#define _PY_NSMALLPOSINTS 257
#define _PY_NSMALLNEGINTS 5
#define _PyLong_DIGIT_INIT(val) \
{ \
_PyVarObject_IMMORTAL_INIT(&PyLong_Type, \
((val) == 0 ? 0 : ((val) > 0 ? 1 : -1))), \
.ob_digit = { ((val) >= 0 ? (val) : -(val)) }, \
}
/**********************
* the global objects *
**********************/
// 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];
} singletons;
};
#define _Py_global_objects_INIT { \
.singletons = { \
.small_ints = { \
_PyLong_DIGIT_INIT(-5), \
_PyLong_DIGIT_INIT(-4), \
_PyLong_DIGIT_INIT(-3), \
_PyLong_DIGIT_INIT(-2), \
_PyLong_DIGIT_INIT(-1), \
_PyLong_DIGIT_INIT(0), \
_PyLong_DIGIT_INIT(1), \
_PyLong_DIGIT_INIT(2), \
_PyLong_DIGIT_INIT(3), \
_PyLong_DIGIT_INIT(4), \
_PyLong_DIGIT_INIT(5), \
_PyLong_DIGIT_INIT(6), \
_PyLong_DIGIT_INIT(7), \
_PyLong_DIGIT_INIT(8), \
_PyLong_DIGIT_INIT(9), \
_PyLong_DIGIT_INIT(10), \
_PyLong_DIGIT_INIT(11), \
_PyLong_DIGIT_INIT(12), \
_PyLong_DIGIT_INIT(13), \
_PyLong_DIGIT_INIT(14), \
_PyLong_DIGIT_INIT(15), \
_PyLong_DIGIT_INIT(16), \
_PyLong_DIGIT_INIT(17), \
_PyLong_DIGIT_INIT(18), \
_PyLong_DIGIT_INIT(19), \
_PyLong_DIGIT_INIT(20), \
_PyLong_DIGIT_INIT(21), \
_PyLong_DIGIT_INIT(22), \
_PyLong_DIGIT_INIT(23), \
_PyLong_DIGIT_INIT(24), \
_PyLong_DIGIT_INIT(25), \
_PyLong_DIGIT_INIT(26), \
_PyLong_DIGIT_INIT(27), \
_PyLong_DIGIT_INIT(28), \
_PyLong_DIGIT_INIT(29), \
_PyLong_DIGIT_INIT(30), \
_PyLong_DIGIT_INIT(31), \
_PyLong_DIGIT_INIT(32), \
_PyLong_DIGIT_INIT(33), \
_PyLong_DIGIT_INIT(34), \
_PyLong_DIGIT_INIT(35), \
_PyLong_DIGIT_INIT(36), \
_PyLong_DIGIT_INIT(37), \
_PyLong_DIGIT_INIT(38), \
_PyLong_DIGIT_INIT(39), \
_PyLong_DIGIT_INIT(40), \
_PyLong_DIGIT_INIT(41), \
_PyLong_DIGIT_INIT(42), \
_PyLong_DIGIT_INIT(43), \
_PyLong_DIGIT_INIT(44), \
_PyLong_DIGIT_INIT(45), \
_PyLong_DIGIT_INIT(46), \
_PyLong_DIGIT_INIT(47), \
_PyLong_DIGIT_INIT(48), \
_PyLong_DIGIT_INIT(49), \
_PyLong_DIGIT_INIT(50), \
_PyLong_DIGIT_INIT(51), \
_PyLong_DIGIT_INIT(52), \
_PyLong_DIGIT_INIT(53), \
_PyLong_DIGIT_INIT(54), \
_PyLong_DIGIT_INIT(55), \
_PyLong_DIGIT_INIT(56), \
_PyLong_DIGIT_INIT(57), \
_PyLong_DIGIT_INIT(58), \
_PyLong_DIGIT_INIT(59), \
_PyLong_DIGIT_INIT(60), \
_PyLong_DIGIT_INIT(61), \
_PyLong_DIGIT_INIT(62), \
_PyLong_DIGIT_INIT(63), \
_PyLong_DIGIT_INIT(64), \
_PyLong_DIGIT_INIT(65), \
_PyLong_DIGIT_INIT(66), \
_PyLong_DIGIT_INIT(67), \
_PyLong_DIGIT_INIT(68), \
_PyLong_DIGIT_INIT(69), \
_PyLong_DIGIT_INIT(70), \
_PyLong_DIGIT_INIT(71), \
_PyLong_DIGIT_INIT(72), \
_PyLong_DIGIT_INIT(73), \
_PyLong_DIGIT_INIT(74), \
_PyLong_DIGIT_INIT(75), \
_PyLong_DIGIT_INIT(76), \
_PyLong_DIGIT_INIT(77), \
_PyLong_DIGIT_INIT(78), \
_PyLong_DIGIT_INIT(79), \
_PyLong_DIGIT_INIT(80), \
_PyLong_DIGIT_INIT(81), \
_PyLong_DIGIT_INIT(82), \
_PyLong_DIGIT_INIT(83), \
_PyLong_DIGIT_INIT(84), \
_PyLong_DIGIT_INIT(85), \
_PyLong_DIGIT_INIT(86), \
_PyLong_DIGIT_INIT(87), \
_PyLong_DIGIT_INIT(88), \
_PyLong_DIGIT_INIT(89), \
_PyLong_DIGIT_INIT(90), \
_PyLong_DIGIT_INIT(91), \
_PyLong_DIGIT_INIT(92), \
_PyLong_DIGIT_INIT(93), \
_PyLong_DIGIT_INIT(94), \
_PyLong_DIGIT_INIT(95), \
_PyLong_DIGIT_INIT(96), \
_PyLong_DIGIT_INIT(97), \
_PyLong_DIGIT_INIT(98), \
_PyLong_DIGIT_INIT(99), \
_PyLong_DIGIT_INIT(100), \
_PyLong_DIGIT_INIT(101), \
_PyLong_DIGIT_INIT(102), \
_PyLong_DIGIT_INIT(103), \
_PyLong_DIGIT_INIT(104), \
_PyLong_DIGIT_INIT(105), \
_PyLong_DIGIT_INIT(106), \
_PyLong_DIGIT_INIT(107), \
_PyLong_DIGIT_INIT(108), \
_PyLong_DIGIT_INIT(109), \
_PyLong_DIGIT_INIT(110), \
_PyLong_DIGIT_INIT(111), \
_PyLong_DIGIT_INIT(112), \
_PyLong_DIGIT_INIT(113), \
_PyLong_DIGIT_INIT(114), \
_PyLong_DIGIT_INIT(115), \
_PyLong_DIGIT_INIT(116), \
_PyLong_DIGIT_INIT(117), \
_PyLong_DIGIT_INIT(118), \
_PyLong_DIGIT_INIT(119), \
_PyLong_DIGIT_INIT(120), \
_PyLong_DIGIT_INIT(121), \
_PyLong_DIGIT_INIT(122), \
_PyLong_DIGIT_INIT(123), \
_PyLong_DIGIT_INIT(124), \
_PyLong_DIGIT_INIT(125), \
_PyLong_DIGIT_INIT(126), \
_PyLong_DIGIT_INIT(127), \
_PyLong_DIGIT_INIT(128), \
_PyLong_DIGIT_INIT(129), \
_PyLong_DIGIT_INIT(130), \
_PyLong_DIGIT_INIT(131), \
_PyLong_DIGIT_INIT(132), \
_PyLong_DIGIT_INIT(133), \
_PyLong_DIGIT_INIT(134), \
_PyLong_DIGIT_INIT(135), \
_PyLong_DIGIT_INIT(136), \
_PyLong_DIGIT_INIT(137), \
_PyLong_DIGIT_INIT(138), \
_PyLong_DIGIT_INIT(139), \
_PyLong_DIGIT_INIT(140), \
_PyLong_DIGIT_INIT(141), \
_PyLong_DIGIT_INIT(142), \
_PyLong_DIGIT_INIT(143), \
_PyLong_DIGIT_INIT(144), \
_PyLong_DIGIT_INIT(145), \
_PyLong_DIGIT_INIT(146), \
_PyLong_DIGIT_INIT(147), \
_PyLong_DIGIT_INIT(148), \
_PyLong_DIGIT_INIT(149), \
_PyLong_DIGIT_INIT(150), \
_PyLong_DIGIT_INIT(151), \
_PyLong_DIGIT_INIT(152), \
_PyLong_DIGIT_INIT(153), \
_PyLong_DIGIT_INIT(154), \
_PyLong_DIGIT_INIT(155), \
_PyLong_DIGIT_INIT(156), \
_PyLong_DIGIT_INIT(157), \
_PyLong_DIGIT_INIT(158), \
_PyLong_DIGIT_INIT(159), \
_PyLong_DIGIT_INIT(160), \
_PyLong_DIGIT_INIT(161), \
_PyLong_DIGIT_INIT(162), \
_PyLong_DIGIT_INIT(163), \
_PyLong_DIGIT_INIT(164), \
_PyLong_DIGIT_INIT(165), \
_PyLong_DIGIT_INIT(166), \
_PyLong_DIGIT_INIT(167), \
_PyLong_DIGIT_INIT(168), \
_PyLong_DIGIT_INIT(169), \
_PyLong_DIGIT_INIT(170), \
_PyLong_DIGIT_INIT(171), \
_PyLong_DIGIT_INIT(172), \
_PyLong_DIGIT_INIT(173), \
_PyLong_DIGIT_INIT(174), \
_PyLong_DIGIT_INIT(175), \
_PyLong_DIGIT_INIT(176), \
_PyLong_DIGIT_INIT(177), \
_PyLong_DIGIT_INIT(178), \
_PyLong_DIGIT_INIT(179), \
_PyLong_DIGIT_INIT(180), \
_PyLong_DIGIT_INIT(181), \
_PyLong_DIGIT_INIT(182), \
_PyLong_DIGIT_INIT(183), \
_PyLong_DIGIT_INIT(184), \
_PyLong_DIGIT_INIT(185), \
_PyLong_DIGIT_INIT(186), \
_PyLong_DIGIT_INIT(187), \
_PyLong_DIGIT_INIT(188), \
_PyLong_DIGIT_INIT(189), \
_PyLong_DIGIT_INIT(190), \
_PyLong_DIGIT_INIT(191), \
_PyLong_DIGIT_INIT(192), \
_PyLong_DIGIT_INIT(193), \
_PyLong_DIGIT_INIT(194), \
_PyLong_DIGIT_INIT(195), \
_PyLong_DIGIT_INIT(196), \
_PyLong_DIGIT_INIT(197), \
_PyLong_DIGIT_INIT(198), \
_PyLong_DIGIT_INIT(199), \
_PyLong_DIGIT_INIT(200), \
_PyLong_DIGIT_INIT(201), \
_PyLong_DIGIT_INIT(202), \
_PyLong_DIGIT_INIT(203), \
_PyLong_DIGIT_INIT(204), \
_PyLong_DIGIT_INIT(205), \
_PyLong_DIGIT_INIT(206), \
_PyLong_DIGIT_INIT(207), \
_PyLong_DIGIT_INIT(208), \
_PyLong_DIGIT_INIT(209), \
_PyLong_DIGIT_INIT(210), \
_PyLong_DIGIT_INIT(211), \
_PyLong_DIGIT_INIT(212), \
_PyLong_DIGIT_INIT(213), \
_PyLong_DIGIT_INIT(214), \
_PyLong_DIGIT_INIT(215), \
_PyLong_DIGIT_INIT(216), \
_PyLong_DIGIT_INIT(217), \
_PyLong_DIGIT_INIT(218), \
_PyLong_DIGIT_INIT(219), \
_PyLong_DIGIT_INIT(220), \
_PyLong_DIGIT_INIT(221), \
_PyLong_DIGIT_INIT(222), \
_PyLong_DIGIT_INIT(223), \
_PyLong_DIGIT_INIT(224), \
_PyLong_DIGIT_INIT(225), \
_PyLong_DIGIT_INIT(226), \
_PyLong_DIGIT_INIT(227), \
_PyLong_DIGIT_INIT(228), \
_PyLong_DIGIT_INIT(229), \
_PyLong_DIGIT_INIT(230), \
_PyLong_DIGIT_INIT(231), \
_PyLong_DIGIT_INIT(232), \
_PyLong_DIGIT_INIT(233), \
_PyLong_DIGIT_INIT(234), \
_PyLong_DIGIT_INIT(235), \
_PyLong_DIGIT_INIT(236), \
_PyLong_DIGIT_INIT(237), \
_PyLong_DIGIT_INIT(238), \
_PyLong_DIGIT_INIT(239), \
_PyLong_DIGIT_INIT(240), \
_PyLong_DIGIT_INIT(241), \
_PyLong_DIGIT_INIT(242), \
_PyLong_DIGIT_INIT(243), \
_PyLong_DIGIT_INIT(244), \
_PyLong_DIGIT_INIT(245), \
_PyLong_DIGIT_INIT(246), \
_PyLong_DIGIT_INIT(247), \
_PyLong_DIGIT_INIT(248), \
_PyLong_DIGIT_INIT(249), \
_PyLong_DIGIT_INIT(250), \
_PyLong_DIGIT_INIT(251), \
_PyLong_DIGIT_INIT(252), \
_PyLong_DIGIT_INIT(253), \
_PyLong_DIGIT_INIT(254), \
_PyLong_DIGIT_INIT(255), \
_PyLong_DIGIT_INIT(256), \
}, \
}, \
}
static inline void
_Py_global_objects_reset(struct _Py_global_objects *objects)
{
}
#ifdef __cplusplus
}
#endif
#endif /* !Py_INTERNAL_GLOBAL_OBJECTS_H */

11
Include/internal/pycore_long.h
View File

@ -8,19 +8,24 @@ extern "C" {
# error "this header requires Py_BUILD_CORE define"
#endif
#include "pycore_long_state.h" // _PyLong_SMALL_INTS
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_global_objects.h" // _PY_NSMALLNEGINTS
#include "pycore_runtime.h" // _PyRuntime
/* runtime lifecycle */
extern void _PyLong_InitGlobalObjects(PyInterpreterState *);
extern PyStatus _PyLong_InitTypes(PyInterpreterState *);
/* other API */
#define _PyLong_SMALL_INTS _Py_SINGLETON(small_ints)
// _PyLong_GetZero() and _PyLong_GetOne() must always be available
#if _PY_NSMALLPOSINTS < 2
# error "_PY_NSMALLPOSINTS must be greater than 1"
#endif
// Return a borrowed reference to the zero singleton.
// The function cannot return NULL.
static inline PyObject* _PyLong_GetZero(void)

33
Include/internal/pycore_long_state.h
View File

@ -1,33 +0,0 @@
#ifndef Py_INTERNAL_LONG_STATE_H
#define Py_INTERNAL_LONG_STATE_H
#ifdef __cplusplus
extern "C" {
#endif
#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif
#define _PY_NSMALLPOSINTS 257
#define _PY_NSMALLNEGINTS 5
// _PyLong_GetZero() and _PyLong_GetOne() must always be available
#if _PY_NSMALLPOSINTS < 2
# error "_PY_NSMALLPOSINTS must be greater than 1"
#endif
struct _Py_long_state {
/* 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 (not inclusive).
*/
PyLongObject small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS];
};
#define _PyLong_SMALL_INTS _PyRuntime.int_state.small_ints
#ifdef __cplusplus
}
#endif
#endif /* !Py_INTERNAL_LONG_STATE_H */

19
Include/internal/pycore_runtime.h
View File

@ -8,10 +8,10 @@ extern "C" {
# error "this header requires Py_BUILD_CORE define"
#endif
#include "pycore_atomic.h" /* _Py_atomic_address */
#include "pycore_gil.h" // struct _gil_runtime_state
#include "pycore_long_state.h" // struct _Py_long_state
#include "pycore_unicodeobject.h" // struct _Py_unicode_runtime_ids
#include "pycore_atomic.h" /* _Py_atomic_address */
#include "pycore_gil.h" // struct _gil_runtime_state
#include "pycore_global_objects.h" // struct _Py_global_objects
#include "pycore_unicodeobject.h" // struct _Py_unicode_runtime_ids
/* ceval state */
@ -101,8 +101,6 @@ typedef struct pyruntimestate {
unsigned long main_thread;
struct _Py_long_state int_state;
#define NEXITFUNCS 32
void (*exitfuncs[NEXITFUNCS])(void);
int nexitfuncs;
@ -120,12 +118,14 @@ typedef struct pyruntimestate {
struct _Py_unicode_runtime_ids unicode_ids;
// XXX Consolidate globals found via the check-c-globals script.
struct _Py_global_objects global_objects;
// If anything gets added after global_objects then
// _PyRuntimeState_reset() needs to get updated to clear it.
} _PyRuntimeState;
#define _PyRuntimeState_INIT \
{ \
._initialized = 0, \
.global_objects = _Py_global_objects_INIT, \
}
/* Note: _PyRuntimeState_INIT sets other fields to 0/NULL */
@ -133,7 +133,8 @@ static inline void
_PyRuntimeState_reset(_PyRuntimeState *runtime)
{
/* Make it match _PyRuntimeState_INIT. */
memset(runtime, 0, sizeof(*runtime));
memset(runtime, 0, (size_t)&runtime->global_objects - (size_t)runtime);
_Py_global_objects_reset(&runtime->global_objects);
}

2
Makefile.pre.in
View File

@ -1613,6 +1613,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_genobject.h \
$(srcdir)/Include/internal/pycore_getopt.h \
$(srcdir)/Include/internal/pycore_gil.h \
$(srcdir)/Include/internal/pycore_global_objects.h \
$(srcdir)/Include/internal/pycore_hamt.h \
$(srcdir)/Include/internal/pycore_hashtable.h \
$(srcdir)/Include/internal/pycore_import.h \
@ -1621,7 +1622,6 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_interpreteridobject.h \
$(srcdir)/Include/internal/pycore_list.h \
$(srcdir)/Include/internal/pycore_long.h \
$(srcdir)/Include/internal/pycore_long_state.h \
$(srcdir)/Include/internal/pycore_moduleobject.h \
$(srcdir)/Include/internal/pycore_namespace.h \
$(srcdir)/Include/internal/pycore_object.h \

29
Objects/longobject.c
View File

@ -5832,29 +5832,6 @@ PyLong_GetInfo(void)
/* runtime lifecycle */
void
_PyLong_InitGlobalObjects(PyInterpreterState *interp)
{
if (!_Py_IsMainInterpreter(interp)) {
return;
}
PyLongObject *small_ints = _PyLong_SMALL_INTS;
if (small_ints[0].ob_base.ob_base.ob_refcnt != 0) {
// Py_Initialize() must be running a second time.
return;
}
for (Py_ssize_t i=0; i < _PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS; i++) {
sdigit ival = (sdigit)i - _PY_NSMALLNEGINTS;
int size = (ival < 0) ? -1 : ((ival == 0) ? 0 : 1);
small_ints[i].ob_base.ob_base.ob_refcnt = 1;
small_ints[i].ob_base.ob_base.ob_type = &PyLong_Type;
small_ints[i].ob_base.ob_size = size;
small_ints[i].ob_digit[0] = (digit)abs(ival);
}
}
PyStatus
_PyLong_InitTypes(PyInterpreterState *interp)
{
@ -5875,9 +5852,3 @@ _PyLong_InitTypes(PyInterpreterState *interp)
return _PyStatus_OK();
}
void
_PyLong_Fini(PyInterpreterState *interp)
{
(void)interp;
}

2
PCbuild/pythoncore.vcxproj
View File

@ -213,6 +213,7 @@
<ClInclude Include="..\Include\internal\pycore_genobject.h" />
<ClInclude Include="..\Include\internal\pycore_getopt.h" />
<ClInclude Include="..\Include\internal\pycore_gil.h" />
<ClInclude Include="..\Include\internal\pycore_global_objects.h" />
<ClInclude Include="..\Include\internal\pycore_hamt.h" />
<ClInclude Include="..\Include\internal\pycore_hashtable.h" />
<ClInclude Include="..\Include\internal\pycore_import.h" />
@ -221,7 +222,6 @@
<ClInclude Include="..\Include\internal\pycore_interpreteridobject.h" />
<ClInclude Include="..\Include\internal\pycore_list.h" />
<ClInclude Include="..\Include\internal\pycore_long.h" />
<ClInclude Include="..\Include\internal\pycore_long_state.h" />
<ClInclude Include="..\Include\internal\pycore_moduleobject.h" />
<ClInclude Include="..\Include\internal\pycore_namespace.h" />
<ClInclude Include="..\Include\internal\pycore_object.h" />

6
PCbuild/pythoncore.vcxproj.filters
View File

@ -549,6 +549,9 @@
<ClInclude Include="..\Include\internal\pycore_gil.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_global_objects.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_hamt.h">
<Filter>Include\internal</Filter>
</ClInclude>
@ -573,9 +576,6 @@
<ClInclude Include="..\Include\internal\pycore_long.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_long_state.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_moduleobject.h">
<Filter>Include\internal</Filter>
</ClInclude>

2
Python/pylifecycle.c
View File

@ -676,8 +676,6 @@ pycore_init_global_objects(PyInterpreterState *interp)
{
PyStatus status;
_PyLong_InitGlobalObjects(interp);
_PyFloat_InitState(interp);
status = _PyBytes_InitGlobalObjects(interp);