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

perf annotate: Move pcnt_with() to the annotation library 

Out of the TUI code, since now all it touches is what is in 'struct
annotation'.

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-kh5bbbgd7l4agv9oc5hnw0ui@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 12:41:39 -03:00
parent 16932d7705
commit 6af612d2b1
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,13 +96,6 @@ static int annotate_browser__set_jumps_percent_color(struct annotate_browser *br
return ui_browser__set_color(&browser->b, color); return ui_browser__set_color(&browser->b, color);
} }
static int annotate_browser__pcnt_width(struct annotate_browser *ab)
{
struct map_symbol *ms = ab->b.priv;
struct annotation *notes = symbol__annotation(ms->sym);
return (notes->options->show_total_period ? 12 : 7) * notes->nr_events;
}
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)
{ {
@ -145,7 +138,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
(!current_entry || (browser->use_navkeypressed && (!current_entry || (browser->use_navkeypressed &&
!browser->navkeypressed))); !browser->navkeypressed)));
int width = browser->width, printed; int width = browser->width, printed;
int i, pcnt_width = annotate_browser__pcnt_width(ab), int i, pcnt_width = annotation__pcnt_width(notes),
cycles_width = annotation__cycles_width(notes); cycles_width = annotation__cycles_width(notes);
double percent_max = 0.0; double percent_max = 0.0;
char bf[256]; char bf[256];
@ -310,7 +303,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
struct map_symbol *ms = ab->b.priv; struct map_symbol *ms = ab->b.priv;
struct symbol *sym = ms->sym; struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym); struct annotation *notes = symbol__annotation(sym);
u8 pcnt_width = annotate_browser__pcnt_width(ab); u8 pcnt_width = annotation__pcnt_width(notes);
int width; int width;
/* PLT symbols contain external offsets */ /* PLT symbols contain external offsets */
@ -375,11 +368,10 @@ 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 annotate_browser *ab = container_of(browser, struct annotate_browser, b);
struct map_symbol *ms = browser->priv; struct map_symbol *ms = browser->priv;
struct annotation *notes = symbol__annotation(ms->sym); 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 = annotate_browser__pcnt_width(ab); int pcnt_width = annotation__pcnt_width(notes);
if (notes->options->jump_arrows) if (notes->options->jump_arrows)
annotate_browser__draw_current_jump(browser); annotate_browser__draw_current_jump(browser);

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

@ -176,6 +176,11 @@ static inline int annotation__cycles_width(struct annotation *notes)
return notes->have_cycles ? ANNOTATION__IPC_WIDTH + ANNOTATION__CYCLES_WIDTH : 0; return notes->have_cycles ? ANNOTATION__IPC_WIDTH + ANNOTATION__CYCLES_WIDTH : 0;
} }
static inline int annotation__pcnt_width(struct annotation *notes)
{
return (notes->options->show_total_period ? 12 : 7) * notes->nr_events;
}
void annotation__compute_ipc(struct annotation *notes, size_t size); void annotation__compute_ipc(struct annotation *notes, size_t size);
static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx) static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)