[Python-checkins] cpython: Only update the state variable once per iteration.

[raymond.hettinger]

https://hg.python.org/cpython/rev/75285bd6991b
changeset:   98812:75285bd6991b
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Oct 20 00:03:33 2015 -0700
summary:
  Only update the state variable once per iteration.

files:
  Modules/_collectionsmodule.c |  12 ++++++++----
  1 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -269,7 +269,6 @@
 static PyObject *
 deque_append(dequeobject *deque, PyObject *item)
 {
-    deque->state++;
     if (deque->rightindex == BLOCKLEN - 1) {
         block *b = newblock(Py_SIZE(deque));
         if (b == NULL)
@@ -288,6 +287,8 @@
     if (NEEDS_TRIM(deque, deque->maxlen)) {
         PyObject *olditem = deque_popleft(deque, NULL);
         Py_DECREF(olditem);
+    } else {
+        deque->state++;
     }
     Py_RETURN_NONE;
 }
@@ -297,7 +298,6 @@
 static PyObject *
 deque_appendleft(dequeobject *deque, PyObject *item)
 {
-    deque->state++;
     if (deque->leftindex == 0) {
         block *b = newblock(Py_SIZE(deque));
         if (b == NULL)
@@ -316,6 +316,8 @@
     if (NEEDS_TRIM(deque, deque->maxlen)) {
         PyObject *olditem = deque_pop(deque, NULL);
         Py_DECREF(olditem);
+    } else {
+        deque->state++;
     }
     Py_RETURN_NONE;
 }
@@ -387,7 +389,6 @@
 
     iternext = *Py_TYPE(it)->tp_iternext;
     while ((item = iternext(it)) != NULL) {
-        deque->state++;
         if (deque->rightindex == BLOCKLEN - 1) {
             block *b = newblock(Py_SIZE(deque));
             if (b == NULL) {
@@ -408,6 +409,8 @@
         if (NEEDS_TRIM(deque, maxlen)) {
             PyObject *olditem = deque_popleft(deque, NULL);
             Py_DECREF(olditem);
+        } else {
+            deque->state++;
         }
     }
     return finalize_iterator(it);
@@ -451,7 +454,6 @@
 
     iternext = *Py_TYPE(it)->tp_iternext;
     while ((item = iternext(it)) != NULL) {
-        deque->state++;
         if (deque->leftindex == 0) {
             block *b = newblock(Py_SIZE(deque));
             if (b == NULL) {
@@ -472,6 +474,8 @@
         if (NEEDS_TRIM(deque, maxlen)) {
             PyObject *olditem = deque_pop(deque, NULL);
             Py_DECREF(olditem);
+        } else {
+            deque->state++;
         }
     }
     return finalize_iterator(it);

-- 
Repository URL: https://hg.python.org/cpython