p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf annotate: Nuke struct browser_line 

The information in there are all related to things already moved to
struct annotation, so move those members to struct annotation_line.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-uc2b9c8iocvuuvbl7hyind84@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2018-03-15 15:43:18 -03:00
parent 0db45bcfac
commit 4850c92e40
2 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tools/perf/ui/browsers/annotate.c
View File

@ -22,11 +22,6 @@ struct disasm_line_samples {
struct sym_hist_entry he; struct sym_hist_entry he;
}; };
struct browser_line {
u32 idx;
int idx_asm;
};
static struct annotation_options annotate_browser__opts = { static struct annotation_options annotate_browser__opts = {
.use_offset = true, .use_offset = true,
.jump_arrows = true, .jump_arrows = true,
@ -58,14 +53,6 @@ static inline struct annotation *browser__annotation(struct ui_browser *browser)
return symbol__annotation(ms->sym); return symbol__annotation(ms->sym);
} }
static inline struct browser_line *browser_line(struct annotation_line *al)
{
void *ptr = al;
ptr = container_of(al, struct disasm_line, al);
return ptr - sizeof(struct browser_line);
}
static bool disasm_line__filter(struct ui_browser *browser, void *entry) static bool disasm_line__filter(struct ui_browser *browser, void *entry)
{ {
struct annotation *notes = browser__annotation(browser); struct annotation *notes = browser__annotation(browser);
@ -285,7 +272,6 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
struct annotate_browser *ab = container_of(browser, struct annotate_browser, b); struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);
struct disasm_line *cursor = disasm_line(ab->selection); struct disasm_line *cursor = disasm_line(ab->selection);
struct annotation_line *target; struct annotation_line *target;
struct browser_line *btarget, *bcursor;
unsigned int from, to; unsigned int from, to;
struct map_symbol *ms = ab->b.priv; struct map_symbol *ms = ab->b.priv;
struct symbol *sym = ms->sym; struct symbol *sym = ms->sym;
@ -327,15 +313,12 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
return; return;
} }
bcursor = browser_line(&cursor->al);
btarget = browser_line(target);
if (notes->options->hide_src_code) { if (notes->options->hide_src_code) {
from = bcursor->idx_asm; from = cursor->al.idx_asm;
to = btarget->idx_asm; to = target->idx_asm;
} else { } else {
from = (u64)bcursor->idx; from = (u64)cursor->al.idx;
to = (u64)btarget->idx; to = (u64)target->idx;
} }
width = annotation__cycles_width(notes); width = annotation__cycles_width(notes);
@ -425,16 +408,11 @@ static void annotate_browser__set_rb_top(struct annotate_browser *browser,
struct rb_node *nd) struct rb_node *nd)
{ {
struct annotation *notes = browser__annotation(&browser->b); struct annotation *notes = browser__annotation(&browser->b);
struct browser_line *bpos; struct annotation_line * pos = rb_entry(nd, struct annotation_line, rb_node);
struct annotation_line *pos; u32 idx = pos->idx;
u32 idx;
pos = rb_entry(nd, struct annotation_line, rb_node);
bpos = browser_line(pos);
idx = bpos->idx;
if (notes->options->hide_src_code) if (notes->options->hide_src_code)
idx = bpos->idx_asm; idx = pos->idx_asm;
annotate_browser__set_top(browser, pos, idx); annotate_browser__set_top(browser, pos, idx);
browser->curr_hot = nd; browser->curr_hot = nd;
} }
@ -484,37 +462,35 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser)
{ {
struct annotation *notes = browser__annotation(&browser->b); struct annotation *notes = browser__annotation(&browser->b);
struct annotation_line *al; struct annotation_line *al;
struct browser_line *bl;
off_t offset = browser->b.index - browser->b.top_idx; off_t offset = browser->b.index - browser->b.top_idx;
browser->b.seek(&browser->b, offset, SEEK_CUR); browser->b.seek(&browser->b, offset, SEEK_CUR);
al = list_entry(browser->b.top, struct annotation_line, node); al = list_entry(browser->b.top, struct annotation_line, node);
bl = browser_line(al);
if (notes->options->hide_src_code) { if (notes->options->hide_src_code) {
if (bl->idx_asm < offset) if (al->idx_asm < offset)
offset = bl->idx; offset = al->idx;
browser->b.nr_entries = browser->nr_entries; browser->b.nr_entries = browser->nr_entries;
notes->options->hide_src_code = false; notes->options->hide_src_code = false;
browser->b.seek(&browser->b, -offset, SEEK_CUR); browser->b.seek(&browser->b, -offset, SEEK_CUR);
browser->b.top_idx = bl->idx - offset; browser->b.top_idx = al->idx - offset;
browser->b.index = bl->idx; browser->b.index = al->idx;
} else { } else {
if (bl->idx_asm < 0) { if (al->idx_asm < 0) {
ui_helpline__puts("Only available for assembly lines."); ui_helpline__puts("Only available for assembly lines.");
browser->b.seek(&browser->b, -offset, SEEK_CUR); browser->b.seek(&browser->b, -offset, SEEK_CUR);
return false; return false;
} }
if (bl->idx_asm < offset) if (al->idx_asm < offset)
offset = bl->idx_asm; offset = al->idx_asm;
browser->b.nr_entries = browser->nr_asm_entries; browser->b.nr_entries = browser->nr_asm_entries;
notes->options->hide_src_code = true; notes->options->hide_src_code = true;
browser->b.seek(&browser->b, -offset, SEEK_CUR); browser->b.seek(&browser->b, -offset, SEEK_CUR);
browser->b.top_idx = bl->idx_asm - offset; browser->b.top_idx = al->idx_asm - offset;
browser->b.index = bl->idx_asm; browser->b.index = al->idx_asm;
} }
return true; return true;
@ -1003,7 +979,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
if (perf_evsel__is_group_event(evsel)) if (perf_evsel__is_group_event(evsel))
nr_pcnt = evsel->nr_members; nr_pcnt = evsel->nr_members;
err = symbol__annotate(sym, map, evsel, sizeof(struct browser_line), &browser.arch); err = symbol__annotate(sym, map, evsel, 0, &browser.arch);
if (err) { if (err) {
char msg[BUFSIZ]; char msg[BUFSIZ];
symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg)); symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));
@ -1018,15 +994,13 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
browser.start = map__rip_2objdump(map, sym->start); browser.start = map__rip_2objdump(map, sym->start);
list_for_each_entry(al, &notes->src->source, node) { list_for_each_entry(al, &notes->src->source, node) {
struct browser_line *bpos;
size_t line_len = strlen(al->line); size_t line_len = strlen(al->line);
if (browser.b.width < line_len) if (browser.b.width < line_len)
browser.b.width = line_len; browser.b.width = line_len;
bpos = browser_line(al); al->idx = browser.nr_entries++;
bpos->idx = browser.nr_entries++;
if (al->offset != -1) { if (al->offset != -1) {
bpos->idx_asm = browser.nr_asm_entries++; al->idx_asm = browser.nr_asm_entries++;
/* /*
* FIXME: short term bandaid to cope with assembly * FIXME: short term bandaid to cope with assembly
* routines that comes with labels in the same column * routines that comes with labels in the same column
@ -1037,7 +1011,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
if (al->offset < (s64)size) if (al->offset < (s64)size)
notes->offsets[al->offset] = al; notes->offsets[al->offset] = al;
} else } else
bpos->idx_asm = -1; al->idx_asm = -1;
} }
annotation__mark_jump_targets(notes, sym); annotation__mark_jump_targets(notes, sym);

2
tools/perf/util/annotate.h
View File

@ -95,6 +95,8 @@ struct annotation_line {
u64 cycles; u64 cycles;
size_t privsize; size_t privsize;
char *path; char *path;
u32 idx;
int idx_asm;
int samples_nr; int samples_nr;
struct annotation_data samples[0]; struct annotation_data samples[0];
}; };