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

Merge 3.5

This commit is contained in:
Victor Stinner 2016-12-30 02:15:29 +01:00
parent acc2f74ca9 440d70301b
commit 771cf898f4
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Doc/library/tracemalloc.rst
View File

@ -66,7 +66,7 @@ Example of output of the Python test suite::
<string>:5: size=49.7 KiB, count=148, average=344 B <string>:5: size=49.7 KiB, count=148, average=344 B
/usr/lib/python3.4/sysconfig.py:411: size=48.0 KiB, count=1, average=48.0 KiB /usr/lib/python3.4/sysconfig.py:411: size=48.0 KiB, count=1, average=48.0 KiB
We can see that Python loaded ``4.8 MiB`` data (bytecode and constants) from We can see that Python loaded ``4855 KiB`` data (bytecode and constants) from
modules and that the :mod:`collections` module allocated ``244 KiB`` to build modules and that the :mod:`collections` module allocated ``244 KiB`` to build
:class:`~collections.namedtuple` types. :class:`~collections.namedtuple` types.
@ -106,8 +106,8 @@ Example of output before/after running some tests of the Python test suite::
/usr/lib/python3.4/urllib/parse.py:476: size=71.8 KiB (+71.8 KiB), count=969 (+969), average=76 B /usr/lib/python3.4/urllib/parse.py:476: size=71.8 KiB (+71.8 KiB), count=969 (+969), average=76 B
/usr/lib/python3.4/contextlib.py:38: size=67.2 KiB (+67.2 KiB), count=126 (+126), average=546 B /usr/lib/python3.4/contextlib.py:38: size=67.2 KiB (+67.2 KiB), count=126 (+126), average=546 B
We can see that Python has loaded ``8.2 MiB`` of module data (bytecode and We can see that Python has loaded ``8173 KiB`` of module data (bytecode and
constants), and that this is ``4.4 MiB`` more than had been loaded before the constants), and that this is ``4428 KiB`` more than had been loaded before the
tests, when the previous snapshot was taken. Similarly, the :mod:`linecache` tests, when the previous snapshot was taken. Similarly, the :mod:`linecache`
module has cached ``940 KiB`` of Python source code to format tracebacks, all module has cached ``940 KiB`` of Python source code to format tracebacks, all
of it since the previous snapshot. of it since the previous snapshot.
@ -176,7 +176,7 @@ Example of output of the Python test suite (traceback limited to 25 frames)::
"__main__", fname, loader, pkg_name) "__main__", fname, loader, pkg_name)
We can see that the most memory was allocated in the :mod:`importlib` module to We can see that the most memory was allocated in the :mod:`importlib` module to
load data (bytecode and constants) from modules: ``870 KiB``. The traceback is load data (bytecode and constants) from modules: ``870.1 KiB``. The traceback is
where the :mod:`importlib` loaded data most recently: on the ``import pdb`` where the :mod:`importlib` loaded data most recently: on the ``import pdb``
line of the :mod:`doctest` module. The traceback may change if a new module is line of the :mod:`doctest` module. The traceback may change if a new module is
loaded. loaded.
@ -192,12 +192,12 @@ ignoring ``<frozen importlib._bootstrap>`` and ``<unknown>`` files::
import os import os
import tracemalloc import tracemalloc
def display_top(snapshot, group_by='lineno', limit=10): def display_top(snapshot, key_type='lineno', limit=10):
snapshot = snapshot.filter_traces(( snapshot = snapshot.filter_traces((
tracemalloc.Filter(False, "<frozen importlib._bootstrap>"), tracemalloc.Filter(False, "<frozen importlib._bootstrap>"),
tracemalloc.Filter(False, "<unknown>"), tracemalloc.Filter(False, "<unknown>"),
)) ))
top_stats = snapshot.statistics(group_by) top_stats = snapshot.statistics(key_type)
print("Top %s lines" % limit) print("Top %s lines" % limit)
for index, stat in enumerate(top_stats[:limit], 1): for index, stat in enumerate(top_stats[:limit], 1):
@ -468,12 +468,12 @@ Snapshot
The :func:`take_snapshot` function creates a snapshot instance. The :func:`take_snapshot` function creates a snapshot instance.
.. method:: compare_to(old_snapshot: Snapshot, group_by: str, cumulative: bool=False) .. method:: compare_to(old_snapshot: Snapshot, key_type: str, cumulative: bool=False)
Compute the differences with an old snapshot. Get statistics as a sorted Compute the differences with an old snapshot. Get statistics as a sorted
list of :class:`StatisticDiff` instances grouped by *group_by*. list of :class:`StatisticDiff` instances grouped by *key_type*.
See the :meth:`Snapshot.statistics` method for *group_by* and *cumulative* See the :meth:`Snapshot.statistics` method for *key_type* and *cumulative*
parameters. parameters.
The result is sorted from the biggest to the smallest by: absolute value The result is sorted from the biggest to the smallest by: absolute value
@ -511,13 +511,13 @@ Snapshot
See also :meth:`dump`. See also :meth:`dump`.
.. method:: statistics(group_by: str, cumulative: bool=False) .. method:: statistics(key_type: str, cumulative: bool=False)
Get statistics as a sorted list of :class:`Statistic` instances grouped Get statistics as a sorted list of :class:`Statistic` instances grouped
by *group_by*: by *key_type*:
===================== ======================== ===================== ========================
group_by description key_type description
===================== ======================== ===================== ========================
``'filename'`` filename ``'filename'`` filename
``'lineno'`` filename and line number ``'lineno'`` filename and line number
@ -526,7 +526,7 @@ Snapshot
If *cumulative* is ``True``, cumulate size and count of memory blocks of If *cumulative* is ``True``, cumulate size and count of memory blocks of
all frames of the traceback of a trace, not only the most recent frame. all frames of the traceback of a trace, not only the most recent frame.
The cumulative mode can only be used with *group_by* equals to The cumulative mode can only be used with *key_type* equals to
``'filename'`` and ``'lineno'``. ``'filename'`` and ``'lineno'``.
The result is sorted from the biggest to the smallest by: The result is sorted from the biggest to the smallest by:

1
Misc/ACKS
View File

@ -1141,6 +1141,7 @@ Alecsandru Patrascu
Randy Pausch Randy Pausch
Samuele Pedroni Samuele Pedroni
Justin Peel Justin Peel
Loic Pefferkorn
Marcel van der Peijl Marcel van der Peijl
Berker Peksag Berker Peksag
Andreas Pelme Andreas Pelme