From: Namhyung Kim <namhyung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] perf top: Use active evsel for non-sample events on old kernel
Date: Sun, 29 Jan 2012 17:55:52 +0900 [thread overview]
Message-ID: <1327827356-8786-1-git-send-email-namhyung@gmail.com> (raw)
If multiple events are specified on old kernel,
perf_evlist__id2evsel() returns NULL for non-sampling events
since the sample.id doesn't contain valid value, and it triggers
assert below. If only one event is given, the function returns
the evsel regardless of sample.id, this is why most case cause
no problem on old kernel.
Fix it by using active evsel.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
tools/perf/builtin-top.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index e8b033c074f9..f68fba52c8d8 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -771,6 +771,14 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
}
evsel = perf_evlist__id2evsel(session->evlist, sample.id);
+ if (evsel == NULL && !session->sample_id_all &&
+ event->header.type != PERF_RECORD_SAMPLE) {
+ /*
+ * Old kernel, no sample_id_all field.
+ * Just use active evsel.
+ */
+ evsel = top->sym_evsel;
+ }
assert(evsel != NULL);
origin = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
--
1.7.8.2
next reply other threads:[~2012-01-29 8:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-29 8:55 Namhyung Kim [this message]
2012-01-29 8:55 ` [PATCH 2/5] perf record: Add error message for EMFILE Namhyung Kim
2012-01-29 15:28 ` David Ahern
2012-01-30 1:09 ` Namhyung Kim
[not found] ` <CAKYOsXxxmG8xQfPcn9xW+Dzd_-Qo8jUv8071UHdC18RBatq=uw@mail.gmail.com>
2012-01-30 18:56 ` Arnaldo Carvalho de Melo
2012-01-29 8:55 ` [PATCH 3/5] perf stat: " Namhyung Kim
2012-01-29 8:55 ` [PATCH 4/5] perf tools: Remove unnecessary ctype.h inclusion Namhyung Kim
2012-01-31 13:22 ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-01-29 8:55 ` [PATCH 5/5] perf lock: Document lock info subcommand Namhyung Kim
2012-01-31 13:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-01-30 18:55 ` [PATCH 1/5] perf top: Use active evsel for non-sample events on old kernel Arnaldo Carvalho de Melo
2012-01-31 0:31 ` Namhyung Kim
2012-01-31 0:34 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327827356-8786-1-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).