openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf annotate tui: Add browser__annotation() helper 

To reduce the boilerplate to get to the symbol being annotated from the
struct browser ->priv area.

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-ficdyqhe9esjseflvkriskwn@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:04:33 -03:00
parent 6af612d2b1
commit 95aa89d92d
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,12 @@ struct annotate_browser {
char search_bf[128]; char search_bf[128];
}; };
static inline struct annotation *browser__annotation(struct ui_browser *browser)
{
struct map_symbol *ms = browser->priv;
return symbol__annotation(ms->sym);
}
static inline struct browser_line *browser_line(struct annotation_line *al) static inline struct browser_line *browser_line(struct annotation_line *al)
{ {
void *ptr = al; void *ptr = al;
@ -65,8 +71,7 @@ static inline struct browser_line *browser_line(struct annotation_line *al)
static bool disasm_line__filter(struct ui_browser *browser, void *entry) static bool disasm_line__filter(struct ui_browser *browser, void *entry)
{ {
struct map_symbol *ms = browser->priv; struct annotation *notes = browser__annotation(browser);
struct annotation *notes = symbol__annotation(ms->sym);
if (notes->options->hide_src_code) { if (notes->options->hide_src_code) {
struct annotation_line *al = list_entry(entry, struct annotation_line, node); struct annotation_line *al = list_entry(entry, struct annotation_line, node);
@ -99,8 +104,7 @@ static int annotate_browser__set_jumps_percent_color(struct annotate_browser *br
static void disasm_line__write(struct disasm_line *dl, struct ui_browser *browser, static void disasm_line__write(struct disasm_line *dl, struct ui_browser *browser,
char *bf, size_t size) char *bf, size_t size)
{ {
struct map_symbol *ms = browser->priv; struct annotation *notes = browser__annotation(browser);
struct annotation *notes = symbol__annotation(ms->sym);
if (dl->ins.ops && dl->ins.ops->scnprintf) { if (dl->ins.ops && dl->ins.ops->scnprintf) {
if (ins__is_jump(&dl->ins)) { if (ins__is_jump(&dl->ins)) {
@ -128,9 +132,7 @@ static void disasm_line__write(struct disasm_line *dl, struct ui_browser *browse
static void annotate_browser__write(struct ui_browser *browser, void *entry, int row) static void annotate_browser__write(struct ui_browser *browser, void *entry, int row)
{ {
struct annotate_browser *ab = container_of(browser, struct annotate_browser, b); struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);
struct map_symbol *ms = browser->priv; struct annotation *notes = browser__annotation(browser);
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
struct annotation_line *al = list_entry(entry, struct annotation_line, node); struct annotation_line *al = list_entry(entry, struct annotation_line, node);
struct browser_line *bl = browser_line(al); struct browser_line *bl = browser_line(al);
bool current_entry = ui_browser__is_current_entry(browser, row); bool current_entry = ui_browser__is_current_entry(browser, row);
@ -368,8 +370,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
static unsigned int annotate_browser__refresh(struct ui_browser *browser) static unsigned int annotate_browser__refresh(struct ui_browser *browser)
{ {
struct map_symbol *ms = browser->priv; struct annotation *notes = browser__annotation(browser);
struct annotation *notes = symbol__annotation(ms->sym);
int ret = ui_browser__list_head_refresh(browser); int ret = ui_browser__list_head_refresh(browser);
int pcnt_width = annotation__pcnt_width(notes); int pcnt_width = annotation__pcnt_width(notes);
@ -438,8 +439,7 @@ static void annotate_browser__set_top(struct annotate_browser *browser,
static void annotate_browser__set_rb_top(struct annotate_browser *browser, static void annotate_browser__set_rb_top(struct annotate_browser *browser,
struct rb_node *nd) struct rb_node *nd)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct annotation *notes = symbol__annotation(ms->sym);
struct browser_line *bpos; struct browser_line *bpos;
struct annotation_line *pos; struct annotation_line *pos;
u32 idx; u32 idx;
@ -497,8 +497,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
static bool annotate_browser__toggle_source(struct annotate_browser *browser) static bool annotate_browser__toggle_source(struct annotate_browser *browser)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct annotation *notes = symbol__annotation(ms->sym);
struct annotation_line *al; struct annotation_line *al;
struct browser_line *bl; struct browser_line *bl;
off_t offset = browser->b.index - browser->b.top_idx; off_t offset = browser->b.index - browser->b.top_idx;
@ -588,9 +587,7 @@ static
struct disasm_line *annotate_browser__find_offset(struct annotate_browser *browser, struct disasm_line *annotate_browser__find_offset(struct annotate_browser *browser,
s64 offset, s64 *idx) s64 offset, s64 *idx)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
struct disasm_line *pos; struct disasm_line *pos;
*idx = 0; *idx = 0;
@ -629,9 +626,7 @@ static
struct annotation_line *annotate_browser__find_string(struct annotate_browser *browser, struct annotation_line *annotate_browser__find_string(struct annotate_browser *browser,
char *s, s64 *idx) char *s, s64 *idx)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
struct annotation_line *al = browser->selection; struct annotation_line *al = browser->selection;
*idx = browser->b.index; *idx = browser->b.index;
@ -668,9 +663,7 @@ static
struct annotation_line *annotate_browser__find_string_reverse(struct annotate_browser *browser, struct annotation_line *annotate_browser__find_string_reverse(struct annotate_browser *browser,
char *s, s64 *idx) char *s, s64 *idx)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
struct annotation_line *al = browser->selection; struct annotation_line *al = browser->selection;
*idx = browser->b.index; *idx = browser->b.index;
@ -753,8 +746,7 @@ bool annotate_browser__continue_search_reverse(struct annotate_browser *browser,
static void annotate_browser__update_addr_width(struct annotate_browser *browser) static void annotate_browser__update_addr_width(struct annotate_browser *browser)
{ {
struct map_symbol *ms = browser->b.priv; struct annotation *notes = browser__annotation(&browser->b);
struct annotation *notes = symbol__annotation(ms->sym);
if (notes->options->use_offset) if (notes->options->use_offset)
browser->target_width = browser->min_addr_width; browser->target_width = browser->min_addr_width;