summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-02-06 16:06:49 +0100
committerVictor Stinner <victor.stinner@gmail.com>2017-02-06 16:06:49 +0100
commit515f1cf20f4e9656b1bcda236bad8ed0e33770f0 (patch)
treecdb40e1de8aa933b51fd390aa0448208dc04ecd7
parentb9bcd948d6c64f86e0999e14542be258b0732792 (diff)
downloadcpython-515f1cf20f4e9656b1bcda236bad8ed0e33770f0.tar.gz
Optimize deque index, insert and rotate() methods
Issue #29452: Use METH_FASTCALL calling convention for index(), insert() and rotate() methods of collections.deque to avoid the creation a temporary tuple to pass position arguments. Speedup on deque methods: * d.rotate(): 1.10x faster * d.rotate(1): 1.24x faster * d.insert(): 1.18x faster * d.index(): 1.24x faster
-rw-r--r--Modules/_collectionsmodule.c40
1 files changed, 29 insertions, 11 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index e8131ad6a0..8615bf1d39 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -908,12 +908,18 @@ done:
}
static PyObject *
-deque_rotate(dequeobject *deque, PyObject *args)
+deque_rotate(dequeobject *deque, PyObject **args, Py_ssize_t nargs,
+ PyObject *kwnames)
{
Py_ssize_t n=1;
- if (!PyArg_ParseTuple(args, "|n:rotate", &n))
+ if (!_PyArg_NoStackKeywords("rotate", kwnames)) {
return NULL;
+ }
+ if (!_PyArg_ParseStack(args, nargs, "|n:rotate", &n)) {
+ return NULL;
+ }
+
if (!_deque_rotate(deque, n))
Py_RETURN_NONE;
return NULL;
@@ -1042,7 +1048,8 @@ deque_len(dequeobject *deque)
}
static PyObject *
-deque_index(dequeobject *deque, PyObject *args)
+deque_index(dequeobject *deque, PyObject **args, Py_ssize_t nargs,
+ PyObject *kwnames)
{
Py_ssize_t i, n, start=0, stop=Py_SIZE(deque);
PyObject *v, *item;
@@ -1051,10 +1058,15 @@ deque_index(dequeobject *deque, PyObject *args)
size_t start_state = deque->state;
int cmp;
- if (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
- _PyEval_SliceIndex, &start,
- _PyEval_SliceIndex, &stop))
+ if (!_PyArg_NoStackKeywords("index", kwnames)) {
+ return NULL;
+ }
+ if (!_PyArg_ParseStack(args, nargs, "O|O&O&:index", &v,
+ _PyEval_SliceIndex, &start,
+ _PyEval_SliceIndex, &stop)) {
return NULL;
+ }
+
if (start < 0) {
start += Py_SIZE(deque);
if (start < 0)
@@ -1117,15 +1129,21 @@ PyDoc_STRVAR(index_doc,
*/
static PyObject *
-deque_insert(dequeobject *deque, PyObject *args)
+deque_insert(dequeobject *deque, PyObject **args, Py_ssize_t nargs,
+ PyObject *kwnames)
{
Py_ssize_t index;
Py_ssize_t n = Py_SIZE(deque);
PyObject *value;
PyObject *rv;
- if (!PyArg_ParseTuple(args, "nO:insert", &index, &value))
+ if (!_PyArg_NoStackKeywords("insert", kwnames)) {
+ return NULL;
+ }
+ if (!_PyArg_ParseStack(args, nargs, "nO:insert", &index, &value)) {
return NULL;
+ }
+
if (deque->maxlen == Py_SIZE(deque)) {
PyErr_SetString(PyExc_IndexError, "deque already at its maximum size");
return NULL;
@@ -1595,9 +1613,9 @@ static PyMethodDef deque_methods[] = {
{"extendleft", (PyCFunction)deque_extendleft,
METH_O, extendleft_doc},
{"index", (PyCFunction)deque_index,
- METH_VARARGS, index_doc},
+ METH_FASTCALL, index_doc},
{"insert", (PyCFunction)deque_insert,
- METH_VARARGS, insert_doc},
+ METH_FASTCALL, insert_doc},
{"pop", (PyCFunction)deque_pop,
METH_NOARGS, pop_doc},
{"popleft", (PyCFunction)deque_popleft,
@@ -1611,7 +1629,7 @@ static PyMethodDef deque_methods[] = {
{"reverse", (PyCFunction)deque_reverse,
METH_NOARGS, reverse_doc},
{"rotate", (PyCFunction)deque_rotate,
- METH_VARARGS, rotate_doc},
+ METH_FASTCALL, rotate_doc},
{"__sizeof__", (PyCFunction)deque_sizeof,
METH_NOARGS, sizeof_doc},
{NULL, NULL} /* sentinel */