Commit 7ea6411f authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

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

Pull perf tooling fixes from Arnaldo Carvalho de Melo:

. Properly handle ~/.debug, the build id cache, when it is a symlink,
  fix from Chanho Park

. Fixes for the parser generation process, from Jiri Olsa and Namhyung Kim

. Fix build when NO_GTK2 is specified, From Stephane Eranian

. When a machine is not found, bump the relevant error stat but return
  0, so that we correctly move to the next perf event. Fix from Jiri Olsa
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents bfecc60d e3b61933
...@@ -19,3 +19,5 @@ TAGS ...@@ -19,3 +19,5 @@ TAGS
cscope* cscope*
config.mak config.mak
config.mak.autogen config.mak.autogen
*-bison.*
*-flex.*
...@@ -237,21 +237,20 @@ export PERL_PATH ...@@ -237,21 +237,20 @@ export PERL_PATH
FLEX = $(CROSS_COMPILE)flex FLEX = $(CROSS_COMPILE)flex
BISON= $(CROSS_COMPILE)bison BISON= $(CROSS_COMPILE)bison
event-parser: $(OUTPUT)util/parse-events-flex.c: util/parse-events.l
$(QUIET_BISON)$(BISON) -v util/parse-events.y -d -o $(OUTPUT)util/parse-events-bison.c
$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
$(OUTPUT)util/parse-events-flex.c: event-parser $(OUTPUT)util/parse-events-bison.c: util/parse-events.y
$(OUTPUT)util/parse-events-bison.c: event-parser $(QUIET_BISON)$(BISON) -v util/parse-events.y -d -o $(OUTPUT)util/parse-events-bison.c
pmu-parser: $(OUTPUT)util/pmu-flex.c: util/pmu.l
$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c
$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
$(OUTPUT)util/pmu-flex.c: pmu-parser $(OUTPUT)util/pmu-bison.c: util/pmu.y
$(OUTPUT)util/pmu-bison.c: pmu-parser $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c
$(OUTPUT)util/parse-events.o: event-parser pmu-parser $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c
$(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
LIB_FILE=$(OUTPUT)libperf.a LIB_FILE=$(OUTPUT)libperf.a
...@@ -527,7 +526,7 @@ else ...@@ -527,7 +526,7 @@ else
endif endif
ifdef NO_GTK2 ifdef NO_GTK2
BASIC_CFLAGS += -DNO_GTK2 BASIC_CFLAGS += -DNO_GTK2_SUPPORT
else else
FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0) FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0)
ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y) ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)
...@@ -852,8 +851,6 @@ help: ...@@ -852,8 +851,6 @@ help:
@echo ' html - make html documentation' @echo ' html - make html documentation'
@echo ' info - make GNU info documentation (access with info <foo>)' @echo ' info - make GNU info documentation (access with info <foo>)'
@echo ' pdf - make pdf documentation' @echo ' pdf - make pdf documentation'
@echo ' event-parser - make event parser code'
@echo ' pmu-parser - make pmu format parser code'
@echo ' TAGS - use etags to make tag information for source browsing' @echo ' TAGS - use etags to make tag information for source browsing'
@echo ' tags - use ctags to make tag information for source browsing' @echo ' tags - use ctags to make tag information for source browsing'
@echo ' cscope - use cscope to make interactive browsing database' @echo ' cscope - use cscope to make interactive browsing database'
......
...@@ -29,13 +29,14 @@ if [ ! -s $BUILDIDS ] ; then ...@@ -29,13 +29,14 @@ if [ ! -s $BUILDIDS ] ; then
fi fi
MANIFEST=$(mktemp /tmp/perf-archive-manifest.XXXXXX) MANIFEST=$(mktemp /tmp/perf-archive-manifest.XXXXXX)
PERF_BUILDID_LINKDIR=$(readlink -f $PERF_BUILDID_DIR)/
cut -d ' ' -f 1 $BUILDIDS | \ cut -d ' ' -f 1 $BUILDIDS | \
while read build_id ; do while read build_id ; do
linkname=$PERF_BUILDID_DIR.build-id/${build_id:0:2}/${build_id:2} linkname=$PERF_BUILDID_DIR.build-id/${build_id:0:2}/${build_id:2}
filename=$(readlink -f $linkname) filename=$(readlink -f $linkname)
echo ${linkname#$PERF_BUILDID_DIR} >> $MANIFEST echo ${linkname#$PERF_BUILDID_DIR} >> $MANIFEST
echo ${filename#$PERF_BUILDID_DIR} >> $MANIFEST echo ${filename#$PERF_BUILDID_LINKDIR} >> $MANIFEST
done done
tar cfj $PERF_DATA.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST tar cfj $PERF_DATA.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST
......
...@@ -876,11 +876,11 @@ static int perf_session_deliver_event(struct perf_session *session, ...@@ -876,11 +876,11 @@ static int perf_session_deliver_event(struct perf_session *session,
dump_sample(session, event, sample); dump_sample(session, event, sample);
if (evsel == NULL) { if (evsel == NULL) {
++session->hists.stats.nr_unknown_id; ++session->hists.stats.nr_unknown_id;
return -1; return 0;
} }
if (machine == NULL) { if (machine == NULL) {
++session->hists.stats.nr_unprocessable_samples; ++session->hists.stats.nr_unprocessable_samples;
return -1; return 0;
} }
return tool->sample(tool, event, sample, evsel, machine); return tool->sample(tool, event, sample, evsel, machine);
case PERF_RECORD_MMAP: case PERF_RECORD_MMAP:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment