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

Commit be267be8 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:

 * Remove die()/exit() calls from several tools.

 * Add missing perf_regs.h file to MANIFEST

 * Clean up and improve 'perf sched' performance by elliminating lots of
   needless calls to libtraceevent.

 * More patches to make perf build on Android, from Irina Tirdea

 * Resolve vdso callchains, from Jiri Olsa

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d5cb2aef 9ec3f4e4

tools/lib/traceevent/event-parse.c

+5 −3
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) 
}



static enum event_type

process_entry(struct event_format *event __unused, struct print_arg *arg,

process_entry(struct event_format *event __maybe_unused, struct print_arg *arg,

	      char **tok)

{

	enum event_type type;
@@ -2458,7 +2458,8 @@ process_paren(struct event_format *event, struct print_arg *arg, char **tok) 




static enum event_type

process_str(struct event_format *event __unused, struct print_arg *arg, char **tok)

process_str(struct event_format *event __maybe_unused, struct print_arg *arg,

	    char **tok)

{

	enum event_type type;

	char *token;
@@ -3653,7 +3654,8 @@ static void free_args(struct print_arg *args) 
}



static char *

get_bprint_format(void *data, int size __unused, struct event_format *event)

get_bprint_format(void *data, int size __maybe_unused,

		  struct event_format *event)

{

	struct pevent *pevent = event->pevent;

	unsigned long long addr;

tools/lib/traceevent/event-parse.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <stdarg.h>

#include <regex.h>



#ifndef __unused

#define __unused __attribute__ ((unused))

#ifndef __maybe_unused

#define __maybe_unused __attribute__((unused))

#endif



/* ----------------------- trace_seq ----------------------- */

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ include/linux/stringify.h 
lib/rbtree.c

include/linux/swab.h

arch/*/include/asm/unistd*.h

arch/*/include/asm/perf_regs.h

arch/*/lib/memcpy*.S

arch/*/lib/memset*.S

include/linux/poison.h

tools/perf/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ LIB_H += util/include/linux/ctype.h 
LIB_H += util/include/linux/kernel.h

LIB_H += util/include/linux/list.h

LIB_H += util/include/linux/export.h

LIB_H += util/include/linux/magic.h

LIB_H += util/include/linux/poison.h

LIB_H += util/include/linux/prefetch.h

LIB_H += util/include/linux/rbtree.h
@@ -336,6 +337,7 @@ LIB_H += util/intlist.h 
LIB_H += util/perf_regs.h

LIB_H += util/unwind.h

LIB_H += ui/helpline.h

LIB_H += util/vdso.h



LIB_OBJS += $(OUTPUT)util/abspath.o

LIB_OBJS += $(OUTPUT)util/alias.o
@@ -403,6 +405,7 @@ LIB_OBJS += $(OUTPUT)util/cgroup.o 
LIB_OBJS += $(OUTPUT)util/target.o

LIB_OBJS += $(OUTPUT)util/rblist.o

LIB_OBJS += $(OUTPUT)util/intlist.o

LIB_OBJS += $(OUTPUT)util/vdso.o



LIB_OBJS += $(OUTPUT)ui/helpline.o

LIB_OBJS += $(OUTPUT)ui/hist.o

tools/perf/bench/bench.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 


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

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

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

extern int bench_mem_memcpy(int argc, const char **argv,

			    const char *prefix __maybe_unused);

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



#define BENCH_FORMAT_DEFAULT_STR	"default"