[PATCHv2 28/35] perf annotate browser: Rename disasm_line__browser to browser_line

From: Jiri Olsa
Date: Mon Nov 06 2017 - 05:56:00 EST


On Wed, Oct 11, 2017 at 05:01:51PM +0200, Jiri Olsa wrote:
> Renaming disasm_line__browser function to browser_line.

v2 with updated changelog attached

jirka


---
Renaming disasm_line__browser function to browser_line, because
the browser got generic and is no longer disasm specific.

Link: http://lkml.kernel.org/n/tip-xsq9ptt57hc26fytdfnvyoaz@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/ui/browsers/annotate.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 31bfc2d1ef13..f6259d06ee61 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -68,7 +68,7 @@ struct annotate_browser {
char search_bf[128];
};

-static inline struct browser_line *disasm_line__browser(struct disasm_line *dl)
+static inline struct browser_line *browser_line(struct disasm_line *dl)
{
return (void *) dl - sizeof(struct browser_line);
}
@@ -118,7 +118,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
{
struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);
struct disasm_line *dl = list_entry(entry, struct disasm_line, al.node);
- struct browser_line *bdl = disasm_line__browser(dl);
+ struct browser_line *bdl = browser_line(dl);
bool current_entry = ui_browser__is_current_entry(browser, row);
bool change_color = (!annotate_browser__opts.hide_src_code &&
(!current_entry || (browser->use_navkeypressed &&
@@ -318,8 +318,8 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
if (!target)
return;

- bcursor = disasm_line__browser(cursor);
- btarget = disasm_line__browser(target);
+ bcursor = browser_line(cursor);
+ btarget = browser_line(target);

if (annotate_browser__opts.hide_src_code) {
from = bcursor->idx_asm;
@@ -417,7 +417,7 @@ static void annotate_browser__set_rb_top(struct annotate_browser *browser,
u32 idx;

pos = rb_entry(nd, struct disasm_line, al.rb_node);
- bpos = disasm_line__browser(pos);
+ bpos = browser_line(pos);

idx = bpos->idx;
if (annotate_browser__opts.hide_src_code)
@@ -472,7 +472,7 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser)

browser->b.seek(&browser->b, offset, SEEK_CUR);
dl = list_entry(browser->b.top, struct disasm_line, al.node);
- bdl = disasm_line__browser(dl);
+ bdl = browser_line(dl);

if (annotate_browser__opts.hide_src_code) {
if (bdl->idx_asm < offset)
@@ -1036,7 +1036,7 @@ static void annotate_browser__mark_jump_targets(struct annotate_browser *browser
if (dlt == NULL)
continue;

- bdlt = disasm_line__browser(dlt);
+ bdlt = browser_line(dlt);
if (++bdlt->jump_sources > browser->max_jump_sources)
browser->max_jump_sources = bdlt->jump_sources;

@@ -1115,7 +1115,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,

if (browser.b.width < line_len)
browser.b.width = line_len;
- bpos = disasm_line__browser(pos);
+ bpos = browser_line(pos);
bpos->idx = browser.nr_entries++;
if (pos->al.offset != -1) {
bpos->idx_asm = browser.nr_asm_entries++;
--
2.13.6