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

Commit 479d8758 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/core improvements and fixes from Arnaldo Carvalho de Melo:

 - Rename libtraceevent 'private' struct member to 'priv' so that it works
   in C++, from Steven Rostedt

 - Remove lots of exit()/die() calls from tools so that the main perf exit
   routine can take place, from David Ahern

 - Fix x86 build on x86-64, from David Ahern.

 - Remove some headers that prevented perf from building on Android,
   from David Ahern

 - {int,str,rb}list fixes from Suzuki K Poulose

 - perf.data header fixes from Namhyung Kim

 - Replace needless mempcpy with memcpy, to allow build on Android, from Irina Tirdea

 - Allow user to indicate objdump path, needed in cross environments, from
   Maciek Borzecki

 - Fix hardware cache event name generation, fix from Jiri Olsa

 - Add round trip test for sw, hw and cache event names, catching the
   problem Jiri fixed, after Jiri's patch, the test passes successfully.

 - Clean target should do clean for lib/traceevent too, fix from David Ahern

 - Check the right variable for allocation failure, fix from Namhyung Kim

 - Set up evsel->tp_format regardless of evsel->name being set already,
   fix from Namhyung Kim

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents bab57e99 275ef387

tools/lib/traceevent/event-parse.h

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct pevent_record { 
	int			cpu;

	int			ref_count;

	int			locked;		/* Do not free, even if ref_count is zero */

	void			*private;

	void			*priv;

#if DEBUG_RECORD

	struct pevent_record	*prev;

	struct pevent_record	*next;
@@ -106,7 +106,7 @@ struct plugin_option { 
	char				*plugin_alias;

	char				*description;

	char				*value;

	void				*private;

	void				*priv;

	int				set;

};

tools/perf/Documentation/perf-annotate.txt

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ OPTIONS 
-M::

--disassembler-style=:: Set disassembler style for objdump.



--objdump=<path>::

        Path to objdump binary.



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-report[1]

tools/perf/Documentation/perf-report.txt

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ OPTIONS 
	branch stacks and it will automatically switch to the branch view mode,

	unless --no-branch-stack is used.



--objdump=<path>::

        Path to objdump binary.



SEE ALSO

--------

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

tools/perf/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -64,12 +64,12 @@ AR = $(CROSS_COMPILE)ar 


# Additional ARCH settings for x86

ifeq ($(ARCH),i386)

	ARCH := x86

	override ARCH := x86

	NO_PERF_REGS := 0

	LIBUNWIND_LIBS = -lunwind -lunwind-x86

endif

ifeq ($(ARCH),x86_64)

	ARCH := x86

	override ARCH := x86

	IS_X86_64 := 0

	ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))

		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
@@ -917,6 +917,9 @@ $(LIB_FILE): $(LIB_OBJS) 
$(LIBTRACEEVENT):

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a



$(LIBTRACEEVENT)-clean:

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean



help:

	@echo 'Perf make targets:'

	@echo '  doc		- make *all* documentation (see below)'
@@ -1056,7 +1059,7 @@ quick-install-html: 


### Cleaning rules



clean:

clean: $(LIBTRACEEVENT)-clean

	$(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)

	$(RM) $(ALL_PROGRAMS) perf

	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*

tools/perf/builtin-annotate.c

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) 
		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

	OPT_STRING(0, "objdump", &objdump_path, "path",

		   "objdump binary to use for disassembly and annotations"),

	OPT_END()

	};