Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 623ec991 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

perf/core fixes and improvements: perf script improvements and minor fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents bb1693f8 cfeb1d90

tools/perf/Documentation/perf-lock.txt

+17 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ perf-lock - Analyze lock events 
SYNOPSIS

--------

[verse]

'perf lock' {record|report|trace}

'perf lock' {record|report|script|info}



DESCRIPTION

-----------
@@ -20,10 +20,13 @@ and statistics with this 'perf lock' command. 
  produces the file "perf.data" which contains tracing

  results of lock events.



  'perf lock trace' shows raw lock events.



  'perf lock report' reports statistical data.



  'perf lock script' shows raw lock events.



  'perf lock info' shows metadata like threads or addresses

  of lock instances.



COMMON OPTIONS

--------------
@@ -47,6 +50,17 @@ REPORT OPTIONS 
        Sorting key. Possible values: acquired (default), contended,

        wait_total, wait_max, wait_min.



INFO OPTIONS

------------



-t::

--threads::

	dump thread list in perf.data



-m::

--map::

	dump map of lock instances (address:name table)



SEE ALSO

--------

linkperf:perf[1]

tools/perf/Documentation/perf-script.txt

+4 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ OPTIONS 
-f::

--fields::

        Comma separated list of fields to print. Options are:

        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr.

        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff.

        Field list can be prepended with the type, trace, sw or hw,

        to indicate to which event type the field list applies.

        e.g., -f sw:comm,tid,time,ip,sym  and -f trace:time,cpu,trace
@@ -200,6 +200,9 @@ OPTIONS 
	It currently includes: cpu and numa topology of the host system.

	It can only be used with the perf script report mode.



--show-kernel-path::

	Try to resolve the path of [kernel.kallsyms]



SEE ALSO

--------

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

tools/perf/bench/mem-memcpy.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *

 * Written by Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>

 */

#include <ctype.h>



#include "../perf.h"

#include "../util/util.h"

tools/perf/bench/mem-memset.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *

 * Trivial clone of mem-memcpy.c.

 */

#include <ctype.h>



#include "../perf.h"

#include "../util/util.h"

tools/perf/builtin-lock.c

+2 −2
Original line number Diff line number Diff line
@@ -922,12 +922,12 @@ static const struct option info_options[] = { 
	OPT_BOOLEAN('t', "threads", &info_threads,

		    "dump thread list in perf.data"),

	OPT_BOOLEAN('m', "map", &info_map,

		    "map of lock instances (name:address table)"),

		    "map of lock instances (address:name table)"),

	OPT_END()

};



static const char * const lock_usage[] = {

	"perf lock [<options>] {record|trace|report}",

	"perf lock [<options>] {record|report|script|info}",

	NULL

};