mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Squash a few calls to the hideously expensive PyObject_CallObject(o,a)

Browse source 
-- replace then with slightly faster PyObject_Call(o,a,NULL).  (The
difference is that the latter requires a to be a tuple; the former
allows other values and wraps them in a tuple if necessary; it
involves two more levels of C function calls to accomplish all that.)
This commit is contained in:
Guido van Rossum 2002-08-16 17:01:09 +00:00
parent c13f724af0
commit 84b2bed435
5 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/abstract.c
View file

@ -1727,7 +1727,7 @@ PyObject_CallFunction(PyObject *callable, char *format, ...)
return NULL;
args = a;
}
retval = PyObject_CallObject(callable, args);
retval = PyObject_Call(callable, args, NULL);
Py_DECREF(args);
@ -1774,7 +1774,7 @@ PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
args = a;
}
retval = PyObject_CallObject(func, args);
retval = PyObject_Call(func, args, NULL);
Py_DECREF(args);
Py_DECREF(func);

7
Objects/iterobject.c
View file

@ -163,7 +163,12 @@ static PyObject *
calliter_iternext(calliterobject *it)
{
if (it->it_callable != NULL) {
PyObject *result = PyObject_CallObject(it->it_callable, NULL);
PyObject *args = PyTuple_New(0);
PyObject *result;
if (args == NULL)
return NULL;
result = PyObject_Call(it->it_callable, args, NULL);
Py_DECREF(args);
if (result != NULL) {
int ok;
ok = PyObject_RichCompareBool(result,

19
Objects/typeobject.c
View file

@ -3257,7 +3257,7 @@ SLOT0(slot_nb_absolute, "__abs__")
static int
slot_nb_nonzero(PyObject *self)
{
PyObject *func, *res;
PyObject *func, *res, *args;
static PyObject *nonzero_str, *len_str;
func = lookup_maybe(self, "__nonzero__", &nonzero_str);
@ -3272,7 +3272,11 @@ slot_nb_nonzero(PyObject *self)
return 1;
}
}
res = PyObject_CallObject(func, NULL);
args = res = PyTuple_New(0);
if (args != NULL) {
res = PyObject_Call(func, args, NULL);
Py_DECREF(args);
}
Py_DECREF(func);
if (res == NULL)
return -1;
@ -3651,9 +3655,14 @@ slot_tp_iter(PyObject *self)
func = lookup_method(self, "__iter__", &iter_str);
if (func != NULL) {
res = PyObject_CallObject(func, NULL);
Py_DECREF(func);
return res;
PyObject *args;
args = res = PyTuple_New(0);
if (args != NULL) {
res = PyObject_Call(func, args, NULL);
Py_DECREF(args);
}
Py_DECREF(func);
return res;
}
PyErr_Clear();
func = lookup_method(self, "__getitem__", &getitem_str);