SF patch #875689: >100k alloc wasted on startup

(Contributed by Mike Pall.)

Make sure fill_free_list() is called only once rather than 106 times
when pre-allocating small ints.

diff --git a/Misc/ACKS b/Misc/ACKS
index 77c798074bc7d4622716aa340284b3ffbe80653e..61b07cba53ee713902c6e65c87d63afb0b1e2ba4 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -411,6 +411,7 @@ Jason Orendorff
 Douglas Orr
 Denis S. Otkidach
 Russel Owen
+Mike Pall
 Todd R. Palmer
 Alexandre Parenteau
 Dan Parisien

diff --git a/Objects/intobject.c b/Objects/intobject.c
index 47acbff96d3803783e7fbc6dbc06d690efe4fb06..18624b31ef1d7044a4ad2dcbec6a0054d7e1b3fd 100644 (file)
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -1064,7 +1064,7 @@ _PyInt_Init(void)
        int ival;
 #if NSMALLNEGINTS + NSMALLPOSINTS > 0
        for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) {
-               if ((free_list = fill_free_list()) == NULL)
+              if (!free_list && (free_list = fill_free_list()) == NULL)
                        return 0;
                /* PyObject_New is inlined */
                v = free_list;