From 4d01259fb262e7eb035b56ae70637884ef4e8cd8 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 16 Dec 2004 10:38:38 +0000 Subject: [PATCH] SF bug #1085744: Performance issues with PySequence_Tuple() * Added missing error checks. * Fixed O(n**2) growth pattern. Modeled after lists to achieve linear amortized resizing. Improves construction of "tuple(it)" when "it" is large and does not have a __len__ method. Other cases are unaffected. --- Objects/abstract.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Objects/abstract.c b/Objects/abstract.c index 377f359300d..b98100155e4 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1427,10 +1427,20 @@ PySequence_Tuple(PyObject *v) break; } if (j >= n) { - if (n < 500) - n += 10; - else - n += 100; + int oldn = n; + /* The over-allocation strategy can grow a bit faster + than for lists because unlike lists the + over-allocation isn't permanent -- we reclaim + the excess before the end of this routine. + So, grow by ten and then add 25%. + */ + n += 10; + n += n >> 2; + if (n < oldn) { + /* Check for overflow */ + PyErr_NoMemory(); + goto Fail; + } if (_PyTuple_Resize(&result, n) != 0) { Py_DECREF(item); goto Fail;