From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>, Paul Mackerras <paulus@samba.org>,
Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Andi Kleen <andi@firstfloor.org>
Subject: [PATCH 4/7] perf ui/tui: Fix off-by-one in hist_browser__update_nr_entries()
Date: Wed, 23 Apr 2014 16:00:05 +0900 [thread overview]
Message-ID: <1398236408-8856-5-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1398236408-8856-1-git-send-email-namhyung@kernel.org>
The nr_entries variable is increased inside the loop in the function
but it always count the first entry regardless of it's filtered or
not; caused an off-by-one error.
It'd become a problem especially there's no entry at all - it'd get a
segfault during referencing a NULL pointer.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/ui/browsers/hists.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4d416984c59d..311226edae12 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1348,10 +1348,10 @@ static void hist_browser__update_pcnt_entries(struct hist_browser *hb)
u64 nr_entries = 0;
struct rb_node *nd = rb_first(&hb->hists->entries);
- while (nd) {
+ while ((nd = hists__filter_entries(nd, hb->hists,
+ hb->min_pcnt)) != NULL) {
nr_entries++;
- nd = hists__filter_entries(rb_next(nd), hb->hists,
- hb->min_pcnt);
+ nd = rb_next(nd);
}
hb->nr_pcnt_entries = nr_entries;
--
1.9.2
next prev parent reply other threads:[~2014-04-23 7:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-23 7:00 [PATCHSET 0/7] perf tools: Fixup for the --percentage change (v2) Namhyung Kim
2014-04-23 7:00 ` [PATCH 1/7] perf report: Count number of entries separately Namhyung Kim
2014-04-23 7:00 ` [PATCH 2/7] perf tools: Account entry stats when it's added to the output tree Namhyung Kim
2014-04-23 13:35 ` Jiri Olsa
2014-04-23 14:43 ` Namhyung Kim
2014-04-23 7:00 ` [PATCH 3/7] perf hists: Add missing update on filtered stats in hists__decay_entries() Namhyung Kim
2014-04-23 7:00 ` Namhyung Kim [this message]
2014-04-23 7:00 ` [PATCH 5/7] perf ui/tui: Rename hist_browser__update_nr_entries() Namhyung Kim
2014-04-23 7:00 ` [PATCH 6/7] perf top/tui: Update nr_entries properly after a filter is applied Namhyung Kim
2014-04-23 7:00 ` [PATCH 7/7] perf hists/tui: Count callchain rows separately Namhyung Kim
2014-04-23 14:29 ` Jiri Olsa
2014-04-23 14:57 ` Namhyung Kim
2014-04-23 15:07 ` Jiri Olsa
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=1398236408-8856-5-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--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
all inboxes | Powered by JetHome®