python-checkins at python
Aug 3, 2012, 5:52 AM
Post #1 of 1
(38 views)
Permalink
|
|
cpython (2.7): Closes #15469: Correct sizeof support for deque
|
|
http://hg.python.org/cpython/rev/a3d49f1de893
changeset: 78393:a3d49f1de893
branch: 2.7
parent: 78390:aceb975c4832
user: Jesus Cea <jcea [at] jcea>
date: Fri Aug 03 14:48:23 2012 +0200
summary:
Closes #15469: Correct __sizeof__ support for deque
files:
Lib/test/test_deque.py | 16 ++++++++++++++++
Misc/NEWS | 3 +++
Modules/_collectionsmodule.c | 21 ++++++++++++++++++++-
3 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -6,6 +6,7 @@
import copy
import cPickle as pickle
import random
+import struct
BIG = 100000
@@ -517,6 +518,21 @@
gc.collect()
self.assertTrue(ref() is None, "Cycle was not collected")
+ check_sizeof = test_support.check_sizeof
+
+ @test_support.cpython_only
+ def test_sizeof(self):
+ BLOCKLEN = 62
+ basesize = test_support.calcobjsize('2P4PlP')
+ blocksize = struct.calcsize('2P%dP' % BLOCKLEN)
+ self.assertEqual(object.__sizeof__(deque()), basesize)
+ 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' * (42 * BLOCKLEN)), basesize + 43 * blocksize)
+
class TestVariousIteratorArgs(unittest.TestCase):
def test_constructor(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -104,6 +104,9 @@
- Issue #15489: Add a __sizeof__ implementation for BytesIO objects.
Patch by Serhiy Storchaka.
+- Issue #15469: Add a __sizeof__ implementation for deque objects.
+ Patch by Serhiy Storchaka.
+
- Issue #15487: Add a __sizeof__ implementation for buffered I/O objects.
Patch by Serhiy Storchaka.
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -991,6 +991,23 @@
}
static PyObject *
+deque_sizeof(dequeobject *deque, void *unused)
+{
+ Py_ssize_t res;
+ Py_ssize_t blocks;
+
+ res = sizeof(dequeobject);
+ blocks = (deque->leftindex + deque->len + BLOCKLEN - 1) / BLOCKLEN;
+ assert(deque->leftindex + deque->len - 1 ==
+ (blocks - 1) * BLOCKLEN + deque->rightindex);
+ res += blocks * sizeof(block);
+ return PyLong_FromSsize_t(res);
+}
+
+PyDoc_STRVAR(sizeof_doc,
+"D.__sizeof__() -- size of D in memory, in bytes");
+
+static PyObject *
deque_get_maxlen(dequeobject *deque)
{
if (deque->maxlen == -1)
@@ -1053,7 +1070,9 @@
{"reverse", (PyCFunction)deque_reverse,
METH_NOARGS, reverse_doc},
{"rotate", (PyCFunction)deque_rotate,
- METH_VARARGS, rotate_doc},
+ METH_VARARGS, rotate_doc},
+ {"__sizeof__", (PyCFunction)deque_sizeof,
+ METH_NOARGS, sizeof_doc},
{NULL, NULL} /* sentinel */
};
--
Repository URL: http://hg.python.org/cpython
|
