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

Commit 19774998 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

Pull perf tooling updates from Arnaldo Carvalho de Melo:

New features:

 * perf record: Add --initial-delay option (Andi Kleen)

 * Column colouring improvements in 'diff' (Ramkumar Ramachandra)

Fixes:

 * Don't show counter information when workload fails (Arnaldo Carvalho de Melo)

 * Fixup leak on error path in parse events test. (Arnaldo Carvalho de Melo)

 * Fix --delay option in 'stat' man page (Andi Kleen)

 * Use the DWARF unwind info only if loaded (Jean Pihet):

Developer stuff:

 * Improve forked workload error reporting by sending the errno in the signal
   data queueing integer field, using sigqueue and by doing the signal setup in
   the evlist methods, removing open coded equivalents in various tools. (Arnaldo Carvalho de Melo)

 * Do more auto exit cleanup shores in the 'evlist' destructor, so that the tools
   don't have to all do that sequence. (Arnaldo Carvalho de Melo)

 * Pack 'struct perf_session_env' and 'struct trace' (Arnaldo Carvalho de Melo)

 * Include tools/lib/api/ in MANIFEST, fixing detached tarballs (Arnaldo Carvalho de Melo)

 * Add test for building detached source tarballs (Arnaldo Carvalho de Melo)

 * Shut up libtracevent plugins make message (Jiri Olsa)

 * Fix installation tests path setup (Jiri Olsa)

 * Fix id_hdr_size initialization (Jiri Olsa)

 * Move some header files from tools/perf/ to tools/include/ to make them available to
   other tools/ dwelling codebases (Namhyung Kim)

 * Fix 'probe' build when DWARF support libraries not present (Arnaldo Carvalho de Melo)

Refactorings:

 * Move logic to warn about kptr_restrict'ed kernels to separate
   function in 'report' (Arnaldo Carvalho de Melo)

 * Move hist browser selection code to separate function (Arnaldo Carvalho de Melo)

 * Move histogram entries collapsing to separate function (Arnaldo Carvalho de Melo)

 * Introduce evlist__for_each() & friends (Arnaldo Carvalho de Melo)

 * Automate setup of FEATURE_CHECK_(C|LD)FLAGS-all variables (Jiri Olsa)

 * Move arch setup into seprate Makefile (Jiri Olsa)

Trivial stuff:

 * Remove misplaced __maybe_unused in 'stat' (Arnaldo Carvalho de Melo)

 * Remove old evsel_list usage in 'record' (Arnaldo Carvalho de Melo)

 * Comment typo fix (Cody P Schafer)

 * Remove unused test-volatile-register-var.c (Yann Droneaud)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1341f3e4 26f7f987

tools/perf/util/include/asm/bug.h→tools/include/asm/bug.h

+6 −3
Original line number Diff line number Diff line 
#ifndef _PERF_ASM_GENERIC_BUG_H

#define _PERF_ASM_GENERIC_BUG_H

#ifndef _TOOLS_ASM_BUG_H

#define _TOOLS_ASM_BUG_H



#include <linux/compiler.h>



#define __WARN_printf(arg...)	do { fprintf(stderr, arg); } while (0)
@@ -19,4 +21,5 @@ 
			__warned = 1;		\

	unlikely(__ret_warn_once);		\

})

#endif
 


#endif /* _TOOLS_ASM_BUG_H */

tools/perf/util/include/linux/compiler.h→tools/include/linux/compiler.h

+10 −2
Original line number Diff line number Diff line 
#ifndef _PERF_LINUX_COMPILER_H_

#define _PERF_LINUX_COMPILER_H_

#ifndef _TOOLS_LINUX_COMPILER_H_

#define _TOOLS_LINUX_COMPILER_H_



#ifndef __always_inline

# define __always_inline	inline __attribute__((always_inline))
@@ -27,4 +27,12 @@ 
# define __weak			__attribute__((weak))

#endif



#ifndef likely

# define likely(x)		__builtin_expect(!!(x), 1)

#endif



#ifndef unlikely

# define unlikely(x)		__builtin_expect(!!(x), 0)

#endif



#endif /* _TOOLS_LINUX_COMPILER_H */

tools/lib/traceevent/Makefile

+31 −28
Original line number Diff line number Diff line
@@ -329,9 +329,12 @@ clean: 


endif # skip-makefile



PHONY += force

PHONY += force plugins

force:



plugins:

	@echo > /dev/null



# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable so we can use it in if_changed and friends.

.PHONY: $(PHONY)

tools/perf/Documentation/perf-record.txt

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ overrides that and uses per-thread mmaps. A side-effect of that is that 
inheritance is automatically disabled.  --per-thread is ignored with a warning

if combined with -a or -C options.



--initial-delay msecs::

After starting the program, wait msecs before measuring. This is useful to

filter out the startup phase of the program, which is often very different.



SEE ALSO

--------

linkperf:perf-stat[1], linkperf:perf-list[1]

tools/perf/Documentation/perf-stat.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ use --per-core in addition to -a. (system-wide). The output includes the 
core number and the number of online logical processors on that physical processor.



-D msecs::

--initial-delay msecs::

--delay msecs::

After starting the program, wait msecs before measuring. This is useful to

filter out the startup phase of the program, which is often very different.