summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-07-09 07:13:21 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-07-09 07:13:21 (GMT)
commitd9c116ca403a6fa15d1af414dabc726e862714e7 (patch)
tree0bb350c8b17c6bdb5f6b8fd36c280b326e62f68d
parentbbf8ce5b87f355796ec9fea1cf0adba9de5e5ce1 (diff)
downloadcpython-d9c116ca403a6fa15d1af414dabc726e862714e7.zip
cpython-d9c116ca403a6fa15d1af414dabc726e862714e7.tar.gz
cpython-d9c116ca403a6fa15d1af414dabc726e862714e7.tar.bz2
Add a spacing saving heuristic to deque's extend methods
-rw-r--r--Lib/test/test_deque.py4
-rw-r--r--Modules/_collectionsmodule.c16
2 files changed, 18 insertions, 2 deletions
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py
index e782b99..ae1de9a 100644
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -543,8 +543,8 @@ class TestBasic(unittest.TestCase):
check = self.check_sizeof
check(deque(), basesize + blocksize)
check(deque('a'), basesize + blocksize)
- check(deque('a' * (BLOCKLEN // 2)), basesize + blocksize)
- check(deque('a' * (BLOCKLEN // 2 + 1)), basesize + 2 * blocksize)
+ check(deque('a' * (BLOCKLEN - 1)), basesize + blocksize)
+ check(deque('a' * BLOCKLEN), basesize + 2 * blocksize)
check(deque('a' * (42 * BLOCKLEN)), basesize + 43 * blocksize)
class TestVariousIteratorArgs(unittest.TestCase):
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 9924b63..67ff55b 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -332,6 +332,14 @@ deque_extend(dequeobject *deque, PyObject *iterable)
return result;
}
+ /* Space saving heuristic. Start filling from the left */
+ if (Py_SIZE(deque) == 0) {
+ assert(deque->leftblock == deque->rightblock);
+ assert(deque->leftindex == deque->rightindex+1);
+ deque->leftindex = 1;
+ deque->rightindex = 0;
+ }
+
it = PyObject_GetIter(iterable);
if (it == NULL)
return NULL;
@@ -385,6 +393,14 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
return result;
}
+ /* Space saving heuristic. Start filling from the right */
+ if (Py_SIZE(deque) == 0) {
+ assert(deque->leftblock == deque->rightblock);
+ assert(deque->leftindex == deque->rightindex+1);
+ deque->leftindex = BLOCKLEN - 1;
+ deque->rightindex = BLOCKLEN - 2;
+ }
+
it = PyObject_GetIter(iterable);
if (it == NULL)
return NULL;