From b0ffb2c48a924fdacb65a2320554ddc779a65eb2 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 3 Apr 2012 15:32:45 -0300 Subject: [PATCH] perf ui annotate browser: Add list based search for addr offset From the hit sorted rb_tree, so that we can use it in the upcoming jump instruction support. Cc: David Ahern Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-44a7kl2atf9jxlg9npmotzdg@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 dbf8d3f6b567..c52543c69ae0 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); -- 2.20.1