GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — bpo-45953: Statically initialize the small ints. by ericsnowcurrently · Pull Request #30092 · python/cpython

bpo-45953: Statically initialize the small ints. #30092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 12 commits into python:main from ericsnowcurrently:global-objects-small-ints
Dec 14, 2021

Uh oh!

There was an error while loading. Please reload this page.
Merged

bpo-45953: Statically initialize the small ints. #30092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d9794a
Add struct _Py_global_objects.
ericsnowcurrently Dec 8, 2021
3b0abc9
Add _Py_global_objects.singletons.
ericsnowcurrently Dec 10, 2021
c5e5702
Add _Py_global_objects_reset().
ericsnowcurrently Dec 13, 2021
1432a35
Move the small ints to _Py_global_objects.
ericsnowcurrently Dec 8, 2021
e7d41f2
Drop an unneeded include.
ericsnowcurrently Dec 13, 2021
fca595b
Move a build-time check to the right file.
ericsnowcurrently Dec 13, 2021
8f10ad0
Statically initialize the small ints.
ericsnowcurrently Dec 13, 2021
564a77c
Fix a comment.
ericsnowcurrently Dec 13, 2021
9959c5a
Clean up the initializer.
ericsnowcurrently Dec 13, 2021
c4c85e7
Separate the global objects from the type-specific helpers.
ericsnowcurrently Dec 13, 2021
c017103
Separate the int helpers.
ericsnowcurrently Dec 13, 2021
f2821bd
Do not clear _PyRuntime.global_objects in _PyRuntimeState_reset().
ericsnowcurrently Dec 14, 2021
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Diff view
Diff view

There are no files selected for viewing

337 changes: 337 additions & 0 deletions 337 Include/internal/pycore_global_objects.h
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 8 additions & 3 deletions 11 Include/internal/pycore_long.h
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
33 changes: 0 additions & 33 deletions 33 Include/internal/pycore_long_state.h
Show comments
View file
Open in desktop

This file was deleted.

Oops, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
Loading
Oops, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.