diff options
| author | Dong-hee Na <donghee.na92@gmail.com> | 2017-04-20 08:26:25 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-20 08:26:25 (GMT) |
| commit | df5df13fdc3a71bcf2295acc2cba7f22cfe2d669 (patch) | |
| tree | da68952721f20db8ad4428596608a985d38d10ed | |
| parent | 83a90b9aeda3a4c10e8393893ed4ec8adc861e62 (diff) | |
| download | cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.zip cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.tar.gz cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.tar.bz2 | |
[3.6] bpo-12414: Update code_sizeof() to take in account co_extra memory. (#1168) (#1198)
| -rw-r--r-- | Lib/test/test_sys.py | 8 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Objects/codeobject.c | 10 |
4 files changed, 17 insertions, 6 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index df9ebd4..e151f49 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -913,13 +913,15 @@ class SizeofTest(unittest.TestCase): return inner check(get_cell().__closure__[0], size('P')) # code - check(get_cell().__code__, size('6i13P')) - check(get_cell.__code__, size('6i13P')) + def check_code_size(a, expected_size): + self.assertGreaterEqual(sys.getsizeof(a), expected_size) + check_code_size(get_cell().__code__, size('6i13P')) + check_code_size(get_cell.__code__, size('6i13P')) def get_cell2(x): def inner(): return x return inner - check(get_cell2.__code__, size('6i13P') + 1) + check_code_size(get_cell2.__code__, size('6i13P') + calcsize('n')) # complex check(complex(0,1), size('2d')) # method_descriptor (descriptor object) @@ -1060,6 +1060,7 @@ R. David Murray Matti Mäki Jörg Müller Kaushik N +Dong-hee Na Dale Nagata John Nagle Takahiro Nakayama @@ -10,6 +10,10 @@ What's New in Python 3.6.2 release candidate 1? Core and Builtins ----------------- +- bpo-12414: sys.getsizeof() on a code object now returns the sizes + which includes the code struct and sizes of objects which it references. + Patch by Dong-hee Na. + - bpo-29949: Fix memory usage regression of set and frozenset object. - bpo-29935: Fixed error messages in the index() method of tuple, list and deque diff --git a/Objects/codeobject.c b/Objects/codeobject.c index df8b953..22c4f85 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -446,11 +446,15 @@ code_dealloc(PyCodeObject *co) static PyObject * code_sizeof(PyCodeObject *co, void *unused) { - Py_ssize_t res; + Py_ssize_t res = _PyObject_SIZE(Py_TYPE(co)); + _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) co->co_extra; - res = _PyObject_SIZE(Py_TYPE(co)); if (co->co_cell2arg != NULL && co->co_cellvars != NULL) - res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(unsigned char); + res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t); + + if (co_extra != NULL) + res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]); + return PyLong_FromSsize_t(res); } |