Commit 045e7e60 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 fixes and improvements from Arnaldo Carvalho de Melo:

 * libtraceevent build fixes from Namhyung Kim

 * Prevent overflow when calculating annotation buckets size, from Cody Schafer

 * Set breakpoint events sample period to 1, just like trace events, from Jovi Zhang

 * Fix strerror_r usage, from Kirill Shutemov

 * Fix duplicate function declaration problems with bison 2.6, from Kirill Shutemov

 * Add DSO caching facility (and perf test entry) to speed up binary file
   reading, will be used by the DWARF unwind code, from Jiri Olsa

 * Fix trace event storms by setting PERF_SAMPLE_PERIOD, from Frederic Weisbecker

 * perf kvm fixes from David Ahern

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e2b34e31 8696329b

tools/lib/traceevent/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
TRACEEVENT-CFLAGS

tools/lib/traceevent/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ libtraceevent.so: $(PEVENT_LIB_OBJS) 
libtraceevent.a: $(PEVENT_LIB_OBJS)

	$(Q)$(do_build_static_lib)



$(PEVENT_LIB_OBJS): %.o: $(src)/%.c

$(PEVENT_LIB_OBJS): %.o: $(src)/%.c TRACEEVENT-CFLAGS

	$(Q)$(do_fpic_compile)



define make_version.h
@@ -272,6 +272,16 @@ ifneq ($(dep_includes),) 
 include $(dep_includes)

endif



### Detect environment changes

TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE)



TRACEEVENT-CFLAGS: force

	@FLAGS='$(TRACK_CFLAGS)'; \

	    if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \

		echo 1>&2 "    * new build flags or cross compiler"; \

		echo "$$FLAGS" >TRACEEVENT-CFLAGS; \

            fi



tags:	force

	$(RM) tags

	find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \
@@ -297,7 +307,7 @@ install: install_lib 


clean:

	$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d

	$(RM) tags TAGS

	$(RM) TRACEEVENT-CFLAGS tags TAGS



endif # skip-makefile

tools/perf/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ LIB_OBJS += $(OUTPUT)util/usage.o 
LIB_OBJS += $(OUTPUT)util/wrapper.o

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

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

LIB_OBJS += $(OUTPUT)util/dso-test-data.o

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

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

LIB_OBJS += $(OUTPUT)util/header.o
@@ -803,6 +804,9 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $<



$(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<

tools/perf/builtin-test.c

+4 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,10 @@ static struct test { 
		.desc = "Test perf pmu format parsing",

		.func = test__perf_pmu,

	},

	{

		.desc = "Test dso data interface",

		.func = dso__test_data,

	},

	{

		.func = NULL,

	},

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) 
	/*

	 * We can't annotate with just /proc/kallsyms

	 */

	if (map->dso->symtab_type == SYMTAB__KALLSYMS) {

	if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS) {

		pr_err("Can't annotate %s: No vmlinux file was found in the "

		       "path\n", sym->name);

		sleep(1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE