Commit 3906a13a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

New features:

 - Handle inline functions in callchains (Jin Yao)

 - Enable sorting by srcline as key (Milian Wolff)

Fixes:

 - Fix no_size logic in addr_filter__resolve_kernel_syms() in the
   auxtrace code (Adrian Hunter)

 - Fix some thread refcount leaks in 'perf trace' (Arnaldo Carvalho de Melo)

 - Fix divide by zero when calculating percent for an event in a group in
   the annotate by source line code (Taeung Song)

 - build-id files now aren't anymore symlinks, their parent directories
   are, so readlink the later (Taeung Song)

 - Assorted fixes for null termination problems, mostly related to
   readlink, detected by valgrind (Tommi Rantala)

Infrastructure changes:

 - Make vfs_getname probe point logic in 'perf trace' more robust
   wrt length of pathname (Arnaldo Carvalho de Melo)

 - Remove unused 'prefix' parameter from builtins main functions (Arnaldo Carvalho de Melo)

 - Show 'perf list sdt' option in man page (Ravi Bangoria)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d652f4bb 55f77128

tools/perf/Documentation/perf-list.txt

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ perf-list - List all symbolic event types 
SYNOPSIS

--------

[verse]

'perf list' [--no-desc] [--long-desc] [hw|sw|cache|tracepoint|pmu|event_glob]

'perf list' [--no-desc] [--long-desc] [hw|sw|cache|tracepoint|pmu|sdt|event_glob]



DESCRIPTION

-----------
@@ -244,6 +244,8 @@ To limit the list use: 


. 'pmu' to print the kernel supplied PMU events.



. 'sdt' to list all Statically Defined Tracepoint events.



. If none of the above is matched, it will apply the supplied glob to all

  events, printing the ones that match.

tools/perf/Documentation/perf-report.txt

+5 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ OPTIONS 
	sort_key can be:

	- function: compare on functions (default)

	- address: compare on individual code addresses

	- srcline: compare on source filename and line number



	branch can be:

	- branch: include last branch information in callgraph when available.
@@ -430,6 +431,10 @@ include::itrace.txt[] 
--hierarchy::

	Enable hierarchical output.



--inline::

	If a callgraph address belongs to an inlined function, the inline stack

	will be printed. Each entry is function name or file/line.



include::callchain-overhead-calculation.txt[]



SEE ALSO

tools/perf/bench/bench.h

+10 −10
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ 
# endif

#endif



int bench_numa(int argc, const char **argv, const char *prefix);

int bench_sched_messaging(int argc, const char **argv, const char *prefix);

int bench_sched_pipe(int argc, const char **argv, const char *prefix);

int bench_mem_memcpy(int argc, const char **argv, const char *prefix);

int bench_mem_memset(int argc, const char **argv, const char *prefix);

int bench_futex_hash(int argc, const char **argv, const char *prefix);

int bench_futex_wake(int argc, const char **argv, const char *prefix);

int bench_futex_wake_parallel(int argc, const char **argv, const char *prefix);

int bench_futex_requeue(int argc, const char **argv, const char *prefix);

int bench_numa(int argc, const char **argv);

int bench_sched_messaging(int argc, const char **argv);

int bench_sched_pipe(int argc, const char **argv);

int bench_mem_memcpy(int argc, const char **argv);

int bench_mem_memset(int argc, const char **argv);

int bench_futex_hash(int argc, const char **argv);

int bench_futex_wake(int argc, const char **argv);

int bench_futex_wake_parallel(int argc, const char **argv);

int bench_futex_requeue(int argc, const char **argv);

/* pi futexes */

int bench_futex_lock_pi(int argc, const char **argv, const char *prefix);

int bench_futex_lock_pi(int argc, const char **argv);



#define BENCH_FORMAT_DEFAULT_STR	"default"

#define BENCH_FORMAT_DEFAULT		0

tools/perf/bench/futex-hash.c

+1 −2
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ static void print_summary(void) 
	       (int) runtime.tv_sec);

}



int bench_futex_hash(int argc, const char **argv,

		     const char *prefix __maybe_unused)

int bench_futex_hash(int argc, const char **argv)

{

	int ret = 0;

	cpu_set_t cpu;

tools/perf/bench/futex-lock-pi.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static void create_threads(struct worker *w, pthread_attr_t thread_attr) 
	}

}



int bench_futex_lock_pi(int argc, const char **argv,

			const char *prefix __maybe_unused)

int bench_futex_lock_pi(int argc, const char **argv)

{

	int ret = 0;

	unsigned int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE