diff options
| author | Dong-hee Na <donghee.na92@gmail.com> | 2017-04-20 07:31:17 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-20 07:31:17 (GMT) |
| commit | b4dc6af7a7862a8996cffed30d39d6add5ee58a3 (patch) | |
| tree | fa5fe86f4f1aca739168d41dd874ec866dff8eab | |
| parent | 58f3c9dc8f5626abe09ac9738c34f6ba99ce2972 (diff) | |
| download | cpython-b4dc6af7a7862a8996cffed30d39d6add5ee58a3.zip cpython-b4dc6af7a7862a8996cffed30d39d6add5ee58a3.tar.gz cpython-b4dc6af7a7862a8996cffed30d39d6add5ee58a3.tar.bz2 | |
bpo-12414: Update code_sizeof() to take in account co_extra memory. (#1168)
| -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 | 8 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 748445e..ed78e2a 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -922,13 +922,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') + calcsize('n')) + check_code_size(get_cell2.__code__, size('6i13P') + calcsize('n')) # complex check(complex(0,1), size('2d')) # method_descriptor (descriptor object) @@ -1063,6 +1063,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.7.0 alpha 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-29839: len() now raises ValueError rather than OverflowError if __len__() returned a large negative integer. diff --git a/Objects/codeobject.c b/Objects/codeobject.c index ebc7066..46bc45d 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -451,11 +451,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(Py_ssize_t); + + if (co_extra != NULL) + res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]); + return PyLong_FromSsize_t(res); } |