From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Mike Galbraith <efault@gmx.de>, Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 5/8] perf ui annotate browser: Add list based search for addr offset
Date: Sat, 7 Apr 2012 17:54:06 -0300 [thread overview]
Message-ID: <1333832049-2399-6-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1333832049-2399-1-git-send-email-acme@infradead.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
>From the hit sorted rb_tree, so that we can use it in the upcoming jump
instruction support.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-44a7kl2atf9jxlg9npmotzdg@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/ui/browsers/annotate.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index dbf8d3f..c52543c 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -157,17 +157,13 @@ static void objdump__insert_line(struct rb_root *self,
}
static void annotate_browser__set_top(struct annotate_browser *self,
- struct rb_node *nd)
+ struct objdump_line *pos, u32 idx)
{
- struct objdump_line_rb_node *rbpos;
- struct objdump_line *pos;
unsigned back;
ui_browser__refresh_dimensions(&self->b);
back = self->b.height / 2;
- rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node);
- pos = ((struct objdump_line *)rbpos) - 1;
- self->b.top_idx = self->b.index = rbpos->idx;
+ self->b.top_idx = self->b.index = idx;
while (self->b.top_idx != 0 && back != 0) {
pos = list_entry(pos->node.prev, struct objdump_line, node);
@@ -177,7 +173,18 @@ static void annotate_browser__set_top(struct annotate_browser *self,
}
self->b.top = pos;
- self->curr_hot = nd;
+}
+
+static void annotate_browser__set_rb_top(struct annotate_browser *browser,
+ struct rb_node *nd)
+{
+ struct objdump_line_rb_node *rbpos;
+ struct objdump_line *pos;
+
+ rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node);
+ pos = ((struct objdump_line *)rbpos) - 1;
+ annotate_browser__set_top(browser, pos, rbpos->idx);
+ browser->curr_hot = nd;
}
static void annotate_browser__calc_percent(struct annotate_browser *browser,
@@ -308,7 +315,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
annotate_browser__calc_percent(self, evidx);
if (self->curr_hot)
- annotate_browser__set_top(self, self->curr_hot);
+ annotate_browser__set_rb_top(self, self->curr_hot);
nd = self->curr_hot;
@@ -382,7 +389,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
}
if (nd != NULL)
- annotate_browser__set_top(self, nd);
+ annotate_browser__set_rb_top(self, nd);
}
out:
ui_browser__hide(&self->b);
--
1.7.9.2.358.g22243
next prev parent reply other threads:[~2012-04-07 20:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-07 20:54 [GIT PULL 0/8] perf/urgent new features Arnaldo Carvalho de Melo
2012-04-07 20:54 ` [PATCH 1/8] perf ui browser: Return the current color when setting a new one Arnaldo Carvalho de Melo
2012-04-07 20:54 ` [PATCH 2/8] perf annotate: Allow printing objdump line addr in different color Arnaldo Carvalho de Melo
2012-04-07 20:54 ` [PATCH 3/8] perf ui annotate browser: Allow toggling addr offset view Arnaldo Carvalho de Melo
2012-04-07 20:54 ` [PATCH 4/8] perf ui annotate browser: Move callq handling to separate function Arnaldo Carvalho de Melo
2012-04-07 20:54 ` Arnaldo Carvalho de Melo [this message]
2012-04-07 20:54 ` [PATCH 6/8] perf annotate browser: Initial support for navigating jump instructions Arnaldo Carvalho de Melo
2012-04-09 2:02 ` David Ahern
2012-04-07 20:54 ` [PATCH 7/8] perf report: Correct display of samples and events in header Arnaldo Carvalho de Melo
2012-04-07 20:54 ` [PATCH 8/8] perf annotate browser: string search: /?n Arnaldo Carvalho de Melo
2012-04-08 22:24 ` [GIT PULL 0/8] perf/urgent new features Namhyung Kim
2012-04-13 18:19 ` [tip:perf/core] perf annotate: Fix a build error tip-bot for Namhyung Kim
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=1333832049-2399-6-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.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®