Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-12414: Update code_sizeof() to take in account co_extra memory. (#1168)

This commit is contained in:
Dong-hee Na 2017-04-20 16:31:17 +09:00 committed by Serhiy Storchaka
parent 58f3c9dc8f
commit b4dc6af7a7
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_sys.py
View File

@ -922,13 +922,15 @@ class SizeofTest(unittest.TestCase):
return inner return inner
check(get_cell().__closure__[0], size('P')) check(get_cell().__closure__[0], size('P'))
# code # code
check(get_cell().__code__, size('6i13P')) def check_code_size(a, expected_size):
check(get_cell.__code__, size('6i13P')) 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 get_cell2(x):
def inner(): def inner():
return x return x
return inner return inner
check(get_cell2.__code__, size('6i13P') + calcsize('n')) check_code_size(get_cell2.__code__, size('6i13P') + calcsize('n'))
# complex # complex
check(complex(0,1), size('2d')) check(complex(0,1), size('2d'))
# method_descriptor (descriptor object) # method_descriptor (descriptor object)

1
Misc/ACKS
View File

@ -1063,6 +1063,7 @@ R. David Murray
Matti Mäki Matti Mäki
Jörg Müller Jörg Müller
Kaushik N Kaushik N
Dong-hee Na
Dale Nagata Dale Nagata
John Nagle John Nagle
Takahiro Nakayama Takahiro Nakayama

4
Misc/NEWS
View File

@ -10,6 +10,10 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins 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 - bpo-29839: len() now raises ValueError rather than OverflowError if
__len__() returned a large negative integer. __len__() returned a large negative integer.

8
Objects/codeobject.c
View File

@ -451,11 +451,15 @@ code_dealloc(PyCodeObject *co)
static PyObject * static PyObject *
code_sizeof(PyCodeObject *co, void *unused) 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) if (co->co_cell2arg != NULL && co->co_cellvars != NULL)
res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t); 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); return PyLong_FromSsize_t(res);
} }