Commit 05f5ece7 authored Mar 24, 2016 by Ingo Molnar

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

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

 into perf/urgent

Pull perf/core improvements and fixes:

User visible fixes:

 - Fix documentation of :ppp modifier in 'perf list' (Andi Kleen)

 - Fix silly nodes bitfield bits/bytes length assertion in 'perf bench numa' (Jakub Jelen)

 - Remove redundant CPU output in libtraceevent (Steven Rostedt)

 - Remove 'core_id' check in topology 'perf test' (Sukadev Bhattiprolu)

Infrastructure changes/fixes:

 - Record text offset in dso to calculate objdump address, to use with
   modules in addition to vDSO symbol address calculations (Wang Nan)

 - Move utilities.mak from perf to tools/scripts/ (Arnaldo Carvalho de Melo)

 - Add cpumode to the perf_sample struct, this way we don't need to pass
   the union event to the machine and thread resolving routines, shortening
   function signatures and allowing the future introduction of a way
   to use tracepoint events instead of the unavailable HW cycles counter on
   powerpc guests in perf kvm by just hooking on perf_evsel__parse_sample,
   at the end (Arnaldo Carvalho de Melo)

 - Remove/unexport die() related infrastructure, that at some point will
   finally be removed (Arnaldo Carvalho de Melo)

 - Adopt linux/stringify.h from the kernel sources, not to touch this
   kernel header from tools/ (Arnaldo Carvalho de Melo)

 - Stop using strbuf for things we can instead trivially use libc's asprintf()
   (Arnaldo Carvalho de Melo)

 - Ditch tools/lib/util/abspath.c, its only exported function was used at just
   one place and can be replaced by libc's realpath() (Arnaldo Carvalho de Melo)

 - Use strerror_r() in the llvm infrastructure, tread safe, its what is used
   elsewhere in tools/perf/ (Arnaldo Carvalho de Melo)

Cleanups:

 - Removed misplaced or needless __maybe_unused/export (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 7b0fd569 76267147

tools/include/linux/stringify.h

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		#ifndef __LINUX_STRINGIFY_H
		#define __LINUX_STRINGIFY_H

		/* Indirect stringification. Doing two levels allows the parameter to be a
		* macro itself. For example, compile with -DFOO=bar, __stringify(FOO)
		* converts to "bar".
		*/

		#define __stringify_1(x...) #x
		#define __stringify(x...) __stringify_1(x)

		#endif /* !__LINUX_STRINGIFY_H */

tools/lib/api/Makefile

+1 −1

Original line number	Diff line number	Diff line
		include ../../scripts/Makefile.include
		include ../../perf/config/utilities.mak # QUIET_CLEAN
		include ../../scripts/utilities.mak # QUIET_CLEAN

		ifeq ($(srctree),)
		srctree := $(patsubst %/,%,$(dir $(shell pwd)))

tools/lib/subcmd/Makefile

+1 −1

Original line number	Diff line number	Diff line
		include ../../scripts/Makefile.include
		include ../../perf/config/utilities.mak # QUIET_CLEAN
		include ../../scripts/utilities.mak # QUIET_CLEAN

		ifeq ($(srctree),)
		srctree := $(patsubst %/,%,$(dir $(shell pwd)))

tools/lib/traceevent/event-parse.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -5427,10 +5427,8 @@ void pevent_print_event_time(struct pevent pevent, struct trace_seq s,
		}

		if (pevent->latency_format) {
		trace_seq_printf(s, " %3d", record->cpu);
		pevent_data_lat_fmt(pevent, s, record);
		} else
		trace_seq_printf(s, " [%03d]", record->cpu);
		}

		if (use_usec_format) {
		if (pevent->flags & PEVENT_NSEC_OUTPUT) {

tools/perf/Documentation/Makefile

+1 −1

Original line number	Diff line number	Diff line
		include ../../scripts/Makefile.include
		include ../config/utilities.mak
		include ../../scripts/utilities.mak

		MAN1_TXT= \
		$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \

Admin message