mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 13:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve performance of built-in any()/all() by avoiding PyIter_Next() --

Browse source 
using a trick found in ifilter().
Feel free to backport to 2.5.
This commit is contained in:
Guido van Rossum 2007-12-20 23:48:28 +00:00
parent 30b78048a6
commit 01dbc109a8
1 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Python/bltinmodule.c
View file

@ -78,13 +78,19 @@ static PyObject *
builtin_all(PyObject *self, PyObject *v) builtin_all(PyObject *self, PyObject *v)
{ {
PyObject *it, *item; PyObject *it, *item;
PyObject *(*iternext)(PyObject *);
int cmp;
it = PyObject_GetIter(v); it = PyObject_GetIter(v);
if (it == NULL) if (it == NULL)
return NULL; return NULL;
iternext = *Py_TYPE(it)->tp_iternext;
while ((item = PyIter_Next(it)) != NULL) { for (;;) {
int cmp = PyObject_IsTrue(item); item = iternext(it);
if (item == NULL)
break;
cmp = PyObject_IsTrue(item);
Py_DECREF(item); Py_DECREF(item);
if (cmp < 0) { if (cmp < 0) {
Py_DECREF(it); Py_DECREF(it);
@ -96,8 +102,12 @@ builtin_all(PyObject *self, PyObject *v)
} }
} }
Py_DECREF(it); Py_DECREF(it);
if (PyErr_Occurred()) if (PyErr_Occurred()) {
return NULL; if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else
return NULL;
}
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }
@ -110,13 +120,19 @@ static PyObject *
builtin_any(PyObject *self, PyObject *v) builtin_any(PyObject *self, PyObject *v)
{ {
PyObject *it, *item; PyObject *it, *item;
PyObject *(*iternext)(PyObject *);
int cmp;
it = PyObject_GetIter(v); it = PyObject_GetIter(v);
if (it == NULL) if (it == NULL)
return NULL; return NULL;
iternext = *Py_TYPE(it)->tp_iternext;
while ((item = PyIter_Next(it)) != NULL) { for (;;) {
int cmp = PyObject_IsTrue(item); item = iternext(it);
if (item == NULL)
break;
cmp = PyObject_IsTrue(item);
Py_DECREF(item); Py_DECREF(item);
if (cmp < 0) { if (cmp < 0) {
Py_DECREF(it); Py_DECREF(it);
@ -128,8 +144,12 @@ builtin_any(PyObject *self, PyObject *v)
} }
} }
Py_DECREF(it); Py_DECREF(it);
if (PyErr_Occurred()) if (PyErr_Occurred()) {
return NULL; if (PyErr_ExceptionMatches(PyExc_StopIteration))
PyErr_Clear();
else
return NULL;
}
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }