summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-08-19 14:12:46 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-08-19 14:12:46 (GMT)
commitef1a79799ff9e1c0b94eb7ee753cb8e263605c34 (patch)
treeff0790d4f0bf474388e189908092ef76a1f8ba96
parent79c27c331927e0354f335362010ff86ba1855280 (diff)
parent76b47655ffcb012dda7886dbdbf80c36254c5d2c (diff)
downloadcpython-ef1a79799ff9e1c0b94eb7ee753cb8e263605c34.zip
cpython-ef1a79799ff9e1c0b94eb7ee753cb8e263605c34.tar.gz
cpython-ef1a79799ff9e1c0b94eb7ee753cb8e263605c34.tar.bz2
Issue #15696: Add a __sizeof__ implementation for mmap objects on Windows.
-rw-r--r--Lib/test/test_mmap.py11
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/mmapmodule.c16
3 files changed, 28 insertions, 1 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 6ca5e1b..fa693f3 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -1,5 +1,5 @@
from test.support import (TESTFN, run_unittest, import_module, unlink,
- requires, _2G, _4G, gc_collect)
+ requires, _2G, _4G, gc_collect, cpython_only)
import unittest
import os
import re
@@ -639,6 +639,15 @@ class MmapTests(unittest.TestCase):
m2.close()
m1.close()
+ @cpython_only
+ @unittest.skipUnless(os.name == 'nt', 'requires Windows')
+ def test_sizeof(self):
+ m1 = mmap.mmap(-1, 100)
+ tagname = "foo"
+ m2 = mmap.mmap(-1, 100, tagname=tagname)
+ self.assertEqual(sys.getsize(m2),
+ sys.getsize(m1) + len(tagname) + 1)
+
@unittest.skipUnless(os.name == 'nt', 'requires Windows')
def test_crasher_on_windows(self):
# Should not crash (Issue 1733986)
diff --git a/Misc/NEWS b/Misc/NEWS
index cd4f52b..9458a2a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,6 +121,8 @@ Core and Builtins
Library
-------
+- Issue #15696: Add a __sizeof__ implementation for mmap objects on Windows.
+
- Issue #22068: Avoided reference loops with Variables and Fonts in Tkinter.
- Issue #22165: SimpleHTTPRequestHandler now supports undecodable file names.
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 07b5c6b..1371424 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -709,6 +709,19 @@ mmap__exit__method(PyObject *self, PyObject *args)
return _PyObject_CallMethodId(self, &PyId_close, NULL);
}
+#ifdef MS_WINDOWS
+static PyObject *
+mmap__sizeof__method(mmap_object *self, void *unused)
+{
+ Py_ssize_t res;
+
+ res = sizeof(mmap_object);
+ if (self->tagname)
+ res += strlen(self->tagname) + 1;
+ return PyLong_FromSsize_t(res);
+}
+#endif
+
static struct PyMethodDef mmap_object_methods[] = {
{"close", (PyCFunction) mmap_close_method, METH_NOARGS},
{"find", (PyCFunction) mmap_find_method, METH_VARARGS},
@@ -726,6 +739,9 @@ static struct PyMethodDef mmap_object_methods[] = {
{"write_byte", (PyCFunction) mmap_write_byte_method, METH_VARARGS},
{"__enter__", (PyCFunction) mmap__enter__method, METH_NOARGS},
{"__exit__", (PyCFunction) mmap__exit__method, METH_VARARGS},
+#ifdef MS_WINDOWS
+ {"__sizeof__", (PyCFunction) mmap__sizeof__method, METH_NOARGS},
+#endif
{NULL, NULL} /* sentinel */
};