Commit 8a5897fe authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/urgent

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

New features:

 - Make -a/--all-cpus be the default target in 'perf record' and 'perf stat',
   just like it is with 'perf trace' (Jiri Olsa)

 - Introduce -q/--quiet to the 'annotate', 'diff' and 'report', fix up
   its behaviour in 'record'. This makes the output more compact by
   elliminating headers, leaving just the histogram lines (Namhyung Kim)

Fixes:

 - Handle offline/absent CPUs (Jan Stancek)

Infrastructure changes:

 - Filter out -specs=/a/b/c from CC options when building the python
   support, allowing that feature to be built with clang (Arnaldo Carvalho de Melo)

 - Fix DEBUG=1 build with clang (Arnaldo Carvalho de Melo)

Trivial changes:

 - Fix spelling of 'preempt' in a libtraceevent function name (Steven Rostedt)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2bfe01ef 68ba3235

tools/build/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ all: $(OUTPUT)fixdep 


clean:

	$(call QUIET_CLEAN, fixdep)

	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)rm -f fixdep

	$(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)rm -f $(OUTPUT)fixdep



$(OUTPUT)fixdep-in.o: FORCE

	$(Q)$(MAKE) $(build)=fixdep

tools/build/Makefile.include

+3 −0
Original line number Diff line number Diff line
@@ -3,4 +3,7 @@ build := -f $(srctree)/tools/build/Makefile.build dir=. obj 
fixdep:

	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep



fixdep-clean:

	$(Q)$(MAKE) -C $(srctree)/tools/build clean



.PHONY: fixdep

tools/lib/traceevent/event-parse.c

+2 −2
Original line number Diff line number Diff line
@@ -5204,13 +5204,13 @@ int pevent_data_pid(struct pevent *pevent, struct pevent_record *rec) 
}



/**

 * pevent_data_prempt_count - parse the preempt count from the record

 * pevent_data_preempt_count - parse the preempt count from the record

 * @pevent: a handle to the pevent

 * @rec: the record to parse

 *

 * This returns the preempt count from a record.

 */

int pevent_data_prempt_count(struct pevent *pevent, struct pevent_record *rec)

int pevent_data_preempt_count(struct pevent *pevent, struct pevent_record *rec)

{

	return parse_common_pc(pevent, rec->data);

}

tools/lib/traceevent/event-parse.h

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ void pevent_data_lat_fmt(struct pevent *pevent, 
int pevent_data_type(struct pevent *pevent, struct pevent_record *rec);

struct event_format *pevent_data_event_from_type(struct pevent *pevent, int type);

int pevent_data_pid(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_prempt_count(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_preempt_count(struct pevent *pevent, struct pevent_record *rec);

int pevent_data_flags(struct pevent *pevent, struct pevent_record *rec);

const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid);

struct cmdline;

tools/perf/Documentation/perf-annotate.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ OPTIONS 
--verbose::

        Be more verbose. (Show symbol address, etc)



-q::

--quiet::

	Do not show any message.  (Suppress -v)



-D::

--dump-raw-trace::

        Dump raw trace in ASCII.

CRA Git | Maintained and supported by SUSTech CRA and CCSE