merge heads

Doc/library/profile.rst

@@ -240,11 +240,12 @@ reading the source code for these modules.
         43/3    0.533    0.012    0.749    0.250 pobject.py:99(evaluate)
        ...
 
-   The first line indicates that 2706 calls were monitored.  Of those calls, 2004
+   The first line indicates that 2706 calls were monitored.  Of those
-   were :dfn:`primitive`.  We define :dfn:`primitive` to mean that the call was not
+   calls, 2004 were :dfn:`primitive`.  We define :dfn:`primitive` to
-   induced via recursion. The next line: ``Ordered by: standard name``, indicates
+   mean that the call was not induced via recursion. The next line:
-   that the text string in the far right column was used to sort the output. The
+   ``Ordered by: standard name``, indicates that the text string in
-   column headings include:
+   the far right column was used to sort the output. The column
+   headings include:
 
    ncalls
       for the number of calls,
@@ -266,14 +267,14 @@ reading the source code for these modules.
    filename:lineno(function)
       provides the respective data of each function
 
-   When there are two numbers in the first column (for example, ``43/3``), then the
+   When there are two numbers in the first column (for example,
-   latter is the number of primitive calls, and the former is the actual number of
+   ``43/3``), then the latter is the number of primitive calls, and
-   calls.  Note that when the function does not recurse, these two values are the
+   the former is the actual number of calls.  Note that when the
-   same, and only the single figure is printed.
+   function does not recurse, these two values are the same, and only
+   the single figure is printed.
 
-   If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno),
+   If *sort* is given, it can be one of values allowed for *key*
-   ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or
+   parameter from :meth:`pstats.Stats.sort_stats`.
-   ``'cumulative'`` (sort by cumulative time).  The default is ``'stdname'``.
 
 
 .. function:: runctx(command, globals, locals, filename=None)
@@ -291,19 +292,22 @@ Analysis of the profiler data is done using the :class:`pstats.Stats` class.
 
 .. class:: Stats(*filenames, stream=sys.stdout)
 
-   This class constructor creates an instance of a "statistics object" from a
+   This class constructor creates an instance of a "statistics object"
-   *filename* (or set of filenames).  :class:`Stats` objects are manipulated by
+   from a *filename* (or set of filenames).  :class:`Stats` objects
-   methods, in order to print useful reports.  You may specify an alternate output
+   are manipulated by methods, in order to print useful reports.  You
-   stream by giving the keyword argument, ``stream``.
+   may specify an alternate output stream by giving the keyword
+   argument, ``stream``.
 
-   The file selected by the above constructor must have been created by the
+   The file selected by the above constructor must have been created
-   corresponding version of :mod:`profile` or :mod:`cProfile`.  To be specific,
+   by the corresponding version of :mod:`profile` or :mod:`cProfile`.
-   there is *no* file compatibility guaranteed with future versions of this
+   To be specific, there is *no* file compatibility guaranteed with
-   profiler, and there is no compatibility with files produced by other profilers.
+   future versions of this profiler, and there is no compatibility
-   If several files are provided, all the statistics for identical functions will
+   with files produced by other profilers.  If several files are
-   be coalesced, so that an overall view of several processes can be considered in
+   provided, all the statistics for identical functions will be
-   a single report.  If additional files need to be combined with data in an
+   coalesced, so that an overall view of several processes can be
-   existing :class:`Stats` object, the :meth:`add` method can be used.
+   considered in a single report.  If additional files need to be
+   combined with data in an existing :class:`Stats` object, the
+   :meth:`add` method can be used.
 
    .. (such as the old system profiler).
 
@@ -318,15 +322,17 @@ The :class:`Stats` Class
 
 .. method:: Stats.strip_dirs()
 
-   This method for the :class:`Stats` class removes all leading path information
+   This method for the :class:`Stats` class removes all leading path
-   from file names.  It is very useful in reducing the size of the printout to fit
+   information from file names.  It is very useful in reducing the
-   within (close to) 80 columns.  This method modifies the object, and the stripped
+   size of the printout to fit within (close to) 80 columns.  This
-   information is lost.  After performing a strip operation, the object is
+   method modifies the object, and the stripped information is lost.
-   considered to have its entries in a "random" order, as it was just after object
+   After performing a strip operation, the object is considered to
-   initialization and loading.  If :meth:`strip_dirs` causes two function names to
+   have its entries in a "random" order, as it was just after object
-   be indistinguishable (they are on the same line of the same filename, and have
+   initialization and loading.  If :meth:`strip_dirs` causes two
-   the same function name), then the statistics for these two entries are
+   function names to be indistinguishable (they are on the same line
-   accumulated into a single entry.
+   of the same filename, and have the same function name), then the
+   statistics for these two entries are accumulated into a single
+   entry.
 
 
 .. method:: Stats.add(*filenames)
@@ -340,23 +346,25 @@ The :class:`Stats` Class
 
 .. method:: Stats.dump_stats(filename)
 
-   Save the data loaded into the :class:`Stats` object to a file named *filename*.
+   Save the data loaded into the :class:`Stats` object to a file named
-   The file is created if it does not exist, and is overwritten if it already
+   *filename*.  The file is created if it does not exist, and is
-   exists.  This is equivalent to the method of the same name on the
+   overwritten if it already exists.  This is equivalent to the method
-   :class:`profile.Profile` and :class:`cProfile.Profile` classes.
+   of the same name on the :class:`profile.Profile` and
+   :class:`cProfile.Profile` classes.
 
 
 .. method:: Stats.sort_stats(*keys)
 
-   This method modifies the :class:`Stats` object by sorting it according to the
+   This method modifies the :class:`Stats` object by sorting it
-   supplied criteria.  The argument is typically a string identifying the basis of
+   according to the supplied criteria.  The argument is typically a
-   a sort (example: ``'time'`` or ``'name'``).
+   string identifying the basis of a sort (example: ``'time'`` or
+   ``'name'``).
 
-   When more than one key is provided, then additional keys are used as secondary
+   When more than one key is provided, then additional keys are used
-   criteria when there is equality in all keys selected before them.  For example,
+   as secondary criteria when there is equality in all keys selected
-   ``sort_stats('name', 'file')`` will sort all the entries according to their
+   before them.  For example, ``sort_stats('name', 'file')`` will sort
-   function name, and resolve all ties (identical function names) by sorting by
+   all the entries according to their function name, and resolve all
-   file name.
+   ties (identical function names) by sorting by file name.
 
    Abbreviations can be used for any key names, as long as the abbreviation is
    unambiguous.  The following are the keys currently defined:
@@ -368,10 +376,16 @@ The :class:`Stats` Class
    +------------------+----------------------+
    | ``'cumulative'`` | cumulative time      |
    +------------------+----------------------+
+   | ``'cumtime'``    | cumulative time      |
+   +------------------+----------------------+
    | ``'file'``       | file name            |
    +------------------+----------------------+
+   | ``'filename'``   | file name            |
+   +------------------+----------------------+
    | ``'module'``     | file name            |
    +------------------+----------------------+
+   | ``'ncalls'``     | call count           |
+   +------------------+----------------------+
    | ``'pcalls'``     | primitive call count |
    +------------------+----------------------+
    | ``'line'``       | line number          |
@@ -384,51 +398,60 @@ The :class:`Stats` Class
    +------------------+----------------------+
    | ``'time'``       | internal time        |
    +------------------+----------------------+
+   | ``'tottime'``    | internal time        |
+   +------------------+----------------------+
 
-   Note that all sorts on statistics are in descending order (placing most time
+   Note that all sorts on statistics are in descending order (placing
-   consuming items first), where as name, file, and line number searches are in
+   most time consuming items first), where as name, file, and line
-   ascending order (alphabetical). The subtle distinction between ``'nfl'`` and
+   number searches are in ascending order (alphabetical). The subtle
-   ``'stdname'`` is that the standard name is a sort of the name as printed, which
+   distinction between ``'nfl'`` and ``'stdname'`` is that the
-   means that the embedded line numbers get compared in an odd way.  For example,
+   standard name is a sort of the name as printed, which means that
-   lines 3, 20, and 40 would (if the file names were the same) appear in the string
+   the embedded line numbers get compared in an odd way.  For example,
-   order 20, 3 and 40.  In contrast, ``'nfl'`` does a numeric compare of the line
+   lines 3, 20, and 40 would (if the file names were the same) appear
-   numbers.  In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name',
+   in the string order 20, 3 and 40.  In contrast, ``'nfl'`` does a
-   'file', 'line')``.
+   numeric compare of the line numbers.  In fact,
+   ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file',
+   'line')``.
 
-   For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``,
+   For backward-compatibility reasons, the numeric arguments ``-1``,
-   and ``2`` are permitted.  They are interpreted as ``'stdname'``, ``'calls'``,
+   ``0``, ``1``, and ``2`` are permitted.  They are interpreted as
-   ``'time'``, and ``'cumulative'`` respectively.  If this old style format
+   ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'``
-   (numeric) is used, only one sort key (the numeric key) will be used, and
+   respectively.  If this old style format (numeric) is used, only one
-   additional arguments will be silently ignored.
+   sort key (the numeric key) will be used, and additional arguments
+   will be silently ignored.
 
    .. For compatibility with the old profiler,
 
 
 .. method:: Stats.reverse_order()
 
-   This method for the :class:`Stats` class reverses the ordering of the basic list
+   This method for the :class:`Stats` class reverses the ordering of
-   within the object.  Note that by default ascending vs descending order is
+   the basic list within the object.  Note that by default ascending
-   properly selected based on the sort key of choice.
+   vs descending order is properly selected based on the sort key of
+   choice.
 
    .. This method is provided primarily for compatibility with the old profiler.
 
 
 .. method:: Stats.print_stats(*restrictions)
 
-   This method for the :class:`Stats` class prints out a report as described in the
+   This method for the :class:`Stats` class prints out a report as
-   :func:`profile.run` definition.
+   described in the :func:`profile.run` definition.
 
-   The order of the printing is based on the last :meth:`sort_stats` operation done
+   The order of the printing is based on the last :meth:`sort_stats`
-   on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`).
+   operation done on the object (subject to caveats in :meth:`add` and
+   :meth:`strip_dirs`).
 
-   The arguments provided (if any) can be used to limit the list down to the
+   The arguments provided (if any) can be used to limit the list down
-   significant entries.  Initially, the list is taken to be the complete set of
+   to the significant entries.  Initially, the list is taken to be the
-   profiled functions.  Each restriction is either an integer (to select a count of
+   complete set of profiled functions.  Each restriction is either an
-   lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a
+   integer (to select a count of lines), or a decimal fraction between
-   percentage of lines), or a regular expression (to pattern match the standard
+   0.0 and 1.0 inclusive (to select a percentage of lines), or a
-   name that is printed; as of Python 1.5b1, this uses the Perl-style regular
+   regular expression (to pattern match the standard name that is
-   expression syntax defined by the :mod:`re` module).  If several restrictions are
+   printed; as of Python 1.5b1, this uses the Perl-style regular
-   provided, then they are applied sequentially.  For example::
+   expression syntax defined by the :mod:`re` module).  If several
+   restrictions are provided, then they are applied sequentially.  For
+   example::
 
       print_stats(.1, 'foo:')
 
@@ -455,17 +478,19 @@ The :class:`Stats` Class
      non-parenthesized number repeats the cumulative time spent in the function
      at the right.
 
-   * With :mod:`cProfile`, each caller is preceded by three numbers: the number of
+   * With :mod:`cProfile`, each caller is preceded by three numbers:
-     times this specific call was made, and the total and cumulative times spent in
+     the number of times this specific call was made, and the total
-     the current function while it was invoked by this specific caller.
+     and cumulative times spent in the current function while it was
+     invoked by this specific caller.
 
 
 .. method:: Stats.print_callees(*restrictions)
 
-   This method for the :class:`Stats` class prints a list of all function that were
+   This method for the :class:`Stats` class prints a list of all
-   called by the indicated function.  Aside from this reversal of direction of
+   function that were called by the indicated function.  Aside from
-   calls (re: called vs was called by), the arguments and ordering are identical to
+   this reversal of direction of calls (re: called vs was called by),
-   the :meth:`print_callers` method.
+   the arguments and ordering are identical to the
+   :meth:`print_callers` method.
 
 
 .. _profile-limits:
@@ -566,29 +591,33 @@ you want to the :class:`Profile` class constructor::
 The resulting profiler will then call :func:`your_time_func`.
 
 :class:`profile.Profile`
-   :func:`your_time_func` should return a single number, or a list of numbers whose
+   :func:`your_time_func` should return a single number, or a list of
-   sum is the current time (like what :func:`os.times` returns).  If the function
+   numbers whose sum is the current time (like what :func:`os.times`
-   returns a single time number, or the list of returned numbers has length 2, then
+   returns).  If the function returns a single time number, or the
-   you will get an especially fast version of the dispatch routine.
+   list of returned numbers has length 2, then you will get an
+   especially fast version of the dispatch routine.
 
-   Be warned that you should calibrate the profiler class for the timer function
+   Be warned that you should calibrate the profiler class for the
-   that you choose.  For most machines, a timer that returns a lone integer value
+   timer function that you choose.  For most machines, a timer that
-   will provide the best results in terms of low overhead during profiling.
+   returns a lone integer value will provide the best results in terms
-   (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point
+   of low overhead during profiling.  (:func:`os.times` is *pretty*
-   values).  If you want to substitute a better timer in the cleanest fashion,
+   bad, as it returns a tuple of floating point values).  If you want
-   derive a class and hardwire a replacement dispatch method that best handles your
+   to substitute a better timer in the cleanest fashion, derive a
-   timer call, along with the appropriate calibration constant.
+   class and hardwire a replacement dispatch method that best handles
+   your timer call, along with the appropriate calibration constant.
 
 :class:`cProfile.Profile`
-   :func:`your_time_func` should return a single number.  If it returns
+   :func:`your_time_func` should return a single number.  If it
-   integers, you can also invoke the class constructor with a second argument
+   returns integers, you can also invoke the class constructor with a
-   specifying the real duration of one unit of time.  For example, if
+   second argument specifying the real duration of one unit of time.
-   :func:`your_integer_time_func` returns times measured in thousands of seconds,
+   For example, if :func:`your_integer_time_func` returns times
-   you would construct the :class:`Profile` instance as follows::
+   measured in thousands of seconds, you would construct the
+   :class:`Profile` instance as follows::
 
       pr = profile.Profile(your_integer_time_func, 0.001)
 
-   As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer
+   As the :mod:`cProfile.Profile` class cannot be calibrated, custom
-   functions should be used with care and should be as fast as possible.  For the
+   timer functions should be used with care and should be as fast as
-   best results with a custom timer, it might be necessary to hard-code it in the C
+   possible.  For the best results with a custom timer, it might be
-   source of the internal :mod:`_lsprof` module.
+   necessary to hard-code it in the C source of the internal
+   :mod:`_lsprof` module.