Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / tools / perf / Documentation / perf-script.txt

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 86c87e2..dec87ec 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -115,10 +115,10 @@ OPTIONS
 -f::
 --fields::
         Comma separated list of fields to print. Options are:
 -f::
 --fields::
         Comma separated list of fields to print. Options are:

-        comm, tid, pid, time, cpu, event, trace, sym. Field
-        list can be prepended with the type, trace, sw or hw,
+        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr.
+        Field list can be prepended with the type, trace, sw or hw,

         to indicate to which event type the field list applies.
         to indicate to which event type the field list applies.

-        e.g., -f sw:comm,tid,time,sym  and -f trace:time,cpu,trace
+        e.g., -f sw:comm,tid,time,ip,sym  and -f trace:time,cpu,trace

 
                perf script -f <fields>
 
 
                perf script -f <fields>
 


@@ -132,17 +132,17 @@ OPTIONS
        The arguments are processed in the order received. A later usage can
        reset a prior request. e.g.:
     
        The arguments are processed in the order received. A later usage can
        reset a prior request. e.g.:
     

-               -f trace: -f comm,tid,time,sym
+               -f trace: -f comm,tid,time,ip,sym

     
        The first -f suppresses trace events (field list is ""), but then the
     
        The first -f suppresses trace events (field list is ""), but then the

-       second invocation sets the fields to comm,tid,time,sym. In this case a
+       second invocation sets the fields to comm,tid,time,ip,sym. In this case a

        warning is given to the user:
     
                "Overriding previous field request for all events."
     
        Alternativey, consider the order:
     
        warning is given to the user:
     
                "Overriding previous field request for all events."
     
        Alternativey, consider the order:
     

-               -f comm,tid,time,sym -f trace:
+               -f comm,tid,time,ip,sym -f trace:

     
        The first -f sets the fields for all events and the second -f
        suppresses trace events. The user is given a warning message about
     
        The first -f sets the fields for all events and the second -f
        suppresses trace events. The user is given a warning message about


@@ -182,6 +182,19 @@ OPTIONS
 --hide-call-graph::
         When printing symbols do not display call chain.
 
 --hide-call-graph::
         When printing symbols do not display call chain.
 

+-c::
+--cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
+       be provided as a comma-separated list with no space: 0,1. Ranges of
+       CPUs are specified with -: 0-2. Default is to report samples on all
+       CPUs.
+
+-I::
+--show-info::
+       Display extended information about the perf.data file. This adds
+       information which may be very large and thus may clutter the display.
+       It currently includes: cpu and numa topology of the host system.
+       It can only be used with the perf script report mode.
+

 SEE ALSO
 --------
 linkperf:perf-record[1], linkperf:perf-script-perl[1],
 SEE ALSO
 --------
 linkperf:perf-record[1], linkperf:perf-script-perl[1],