Commit c7e7b610 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf annotate browser: Support event group view on TUI

Dynamically allocate browser_disasm_line according to a number of group
members.  This way we can handle multiple events in a general manner.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/878v5tl2vc.fsf@sejong.aot.lge.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d8d7cd93
...@@ -17,6 +17,10 @@ struct browser_disasm_line { ...@@ -17,6 +17,10 @@ struct browser_disasm_line {
u32 idx; u32 idx;
int idx_asm; int idx_asm;
int jump_sources; int jump_sources;
/*
* actual length of this array is saved on the nr_events field
* of the struct annotate_browser
*/
double percent[1]; double percent[1];
}; };
...@@ -34,8 +38,9 @@ struct annotate_browser { ...@@ -34,8 +38,9 @@ struct annotate_browser {
struct ui_browser b; struct ui_browser b;
struct rb_root entries; struct rb_root entries;
struct rb_node *curr_hot; struct rb_node *curr_hot;
struct disasm_line *selection; struct disasm_line *selection;
struct disasm_line **offsets; struct disasm_line **offsets;
int nr_events;
u64 start; u64 start;
int nr_asm_entries; int nr_asm_entries;
int nr_entries; int nr_entries;
...@@ -95,14 +100,24 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int ...@@ -95,14 +100,24 @@ 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 = 7 * ab->nr_events;
double percent_max = 0.0;
char bf[256]; char bf[256];
if (dl->offset != -1 && bdl->percent[0] != 0.0) { for (i = 0; i < ab->nr_events; i++) {
ui_browser__set_percent_color(browser, bdl->percent[0], current_entry); if (bdl->percent[i] > percent_max)
slsmg_printf("%6.2f ", bdl->percent[0]); percent_max = bdl->percent[i];
}
if (dl->offset != -1 && percent_max != 0.0) {
for (i = 0; i < ab->nr_events; i++) {
ui_browser__set_percent_color(browser, bdl->percent[i],
current_entry);
slsmg_printf("%6.2f ", bdl->percent[i]);
}
} else { } else {
ui_browser__set_percent_color(browser, 0, current_entry); ui_browser__set_percent_color(browser, 0, current_entry);
slsmg_write_nstring(" ", 7); slsmg_write_nstring(" ", pcnt_width);
} }
SLsmg_write_char(' '); SLsmg_write_char(' ');
...@@ -112,12 +127,12 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int ...@@ -112,12 +127,12 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
width += 1; width += 1;
if (!*dl->line) if (!*dl->line)
slsmg_write_nstring(" ", width - 7); slsmg_write_nstring(" ", width - pcnt_width);
else if (dl->offset == -1) { else if (dl->offset == -1) {
printed = scnprintf(bf, sizeof(bf), "%*s ", printed = scnprintf(bf, sizeof(bf), "%*s ",
ab->addr_width, " "); ab->addr_width, " ");
slsmg_write_nstring(bf, printed); slsmg_write_nstring(bf, printed);
slsmg_write_nstring(dl->line, width - printed - 6); slsmg_write_nstring(dl->line, width - printed - pcnt_width + 1);
} else { } else {
u64 addr = dl->offset; u64 addr = dl->offset;
int color = -1; int color = -1;
...@@ -176,7 +191,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int ...@@ -176,7 +191,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
} }
disasm_line__scnprintf(dl, bf, sizeof(bf), !annotate_browser__opts.use_offset); disasm_line__scnprintf(dl, bf, sizeof(bf), !annotate_browser__opts.use_offset);
slsmg_write_nstring(bf, width - 10 - printed); slsmg_write_nstring(bf, width - pcnt_width - 3 - printed);
} }
if (current_entry) if (current_entry)
...@@ -201,6 +216,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) ...@@ -201,6 +216,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
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;
u8 pcnt_width = 7;
/* PLT symbols contain external offsets */ /* PLT symbols contain external offsets */
if (strstr(sym->name, "@plt")) if (strstr(sym->name, "@plt"))
...@@ -224,23 +240,44 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) ...@@ -224,23 +240,44 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
to = (u64)btarget->idx; to = (u64)btarget->idx;
} }
pcnt_width *= ab->nr_events;
ui_browser__set_color(browser, HE_COLORSET_CODE); ui_browser__set_color(browser, HE_COLORSET_CODE);
__ui_browser__line_arrow(browser, 9 + ab->addr_width, from, to); __ui_browser__line_arrow(browser, pcnt_width + 2 + ab->addr_width,
from, to);
} }
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);
int ret = ui_browser__list_head_refresh(browser); int ret = ui_browser__list_head_refresh(browser);
int pcnt_width;
pcnt_width = 7 * ab->nr_events;
if (annotate_browser__opts.jump_arrows) if (annotate_browser__opts.jump_arrows)
annotate_browser__draw_current_jump(browser); annotate_browser__draw_current_jump(browser);
ui_browser__set_color(browser, HE_COLORSET_NORMAL); ui_browser__set_color(browser, HE_COLORSET_NORMAL);
__ui_browser__vline(browser, 7, 0, browser->height - 1); __ui_browser__vline(browser, pcnt_width, 0, browser->height - 1);
return ret; return ret;
} }
static void disasm_rb_tree__insert(struct rb_root *root, struct browser_disasm_line *bdl) static int disasm__cmp(struct browser_disasm_line *a,
struct browser_disasm_line *b, int nr_pcnt)
{
int i;
for (i = 0; i < nr_pcnt; i++) {
if (a->percent[i] == b->percent[i])
continue;
return a->percent[i] < b->percent[i];
}
return 0;
}
static void disasm_rb_tree__insert(struct rb_root *root, struct browser_disasm_line *bdl,
int nr_events)
{ {
struct rb_node **p = &root->rb_node; struct rb_node **p = &root->rb_node;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
...@@ -249,7 +286,8 @@ static void disasm_rb_tree__insert(struct rb_root *root, struct browser_disasm_l ...@@ -249,7 +286,8 @@ static void disasm_rb_tree__insert(struct rb_root *root, struct browser_disasm_l
while (*p != NULL) { while (*p != NULL) {
parent = *p; parent = *p;
l = rb_entry(parent, struct browser_disasm_line, rb_node); l = rb_entry(parent, struct browser_disasm_line, rb_node);
if (bdl->percent[0] < l->percent[0])
if (disasm__cmp(bdl, l, nr_events))
p = &(*p)->rb_left; p = &(*p)->rb_left;
else else
p = &(*p)->rb_right; p = &(*p)->rb_right;
...@@ -313,6 +351,8 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, ...@@ -313,6 +351,8 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
list_for_each_entry(pos, &notes->src->source, node) { list_for_each_entry(pos, &notes->src->source, node) {
struct browser_disasm_line *bpos = disasm_line__browser(pos); struct browser_disasm_line *bpos = disasm_line__browser(pos);
const char *path = NULL; const char *path = NULL;
double max_percent = 0.0;
int i;
if (pos->offset == -1) { if (pos->offset == -1) {
RB_CLEAR_NODE(&bpos->rb_node); RB_CLEAR_NODE(&bpos->rb_node);
...@@ -320,15 +360,24 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, ...@@ -320,15 +360,24 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
} }
next = disasm__get_next_ip_line(&notes->src->source, pos); next = disasm__get_next_ip_line(&notes->src->source, pos);
bpos->percent[0] = disasm__calc_percent(notes, evsel->idx,
pos->offset, next ? next->offset : len,
&path);
if (bpos->percent[0] < 0.01) { for (i = 0; i < browser->nr_events; i++) {
bpos->percent[i] = disasm__calc_percent(notes,
evsel->idx + i,
pos->offset,
next ? next->offset : len,
&path);
if (max_percent < bpos->percent[i])
max_percent = bpos->percent[i];
}
if (max_percent < 0.01) {
RB_CLEAR_NODE(&bpos->rb_node); RB_CLEAR_NODE(&bpos->rb_node);
continue; continue;
} }
disasm_rb_tree__insert(&browser->entries, bpos); disasm_rb_tree__insert(&browser->entries, bpos,
browser->nr_events);
} }
pthread_mutex_unlock(&notes->lock); pthread_mutex_unlock(&notes->lock);
...@@ -829,6 +878,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, ...@@ -829,6 +878,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
}, },
}; };
int ret = -1; int ret = -1;
int nr_pcnt = 1;
size_t sizeof_bdl = sizeof(struct browser_disasm_line);
if (sym == NULL) if (sym == NULL)
return -1; return -1;
...@@ -844,7 +895,12 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, ...@@ -844,7 +895,12 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
return -1; return -1;
} }
if (symbol__annotate(sym, map, sizeof(struct browser_disasm_line)) < 0) { if (perf_evsel__is_group_event(evsel)) {
nr_pcnt = evsel->nr_members;
sizeof_bdl += sizeof(double) * (nr_pcnt - 1);
}
if (symbol__annotate(sym, map, sizeof_bdl) < 0) {
ui__error("%s", ui_helpline__last_msg); ui__error("%s", ui_helpline__last_msg);
goto out_free_offsets; goto out_free_offsets;
} }
...@@ -882,6 +938,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, ...@@ -882,6 +938,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
browser.addr_width = browser.target_width = browser.min_addr_width = hex_width(size); browser.addr_width = browser.target_width = browser.min_addr_width = hex_width(size);
browser.max_addr_width = hex_width(sym->end); browser.max_addr_width = hex_width(sym->end);
browser.jumps_width = width_jumps(browser.max_jump_sources); browser.jumps_width = width_jumps(browser.max_jump_sources);
browser.nr_events = nr_pcnt;
browser.b.nr_entries = browser.nr_entries; browser.b.nr_entries = browser.nr_entries;
browser.b.entries = &notes->src->source, browser.b.entries = &notes->src->source,
browser.b.width += 18; /* Percentage */ browser.b.width += 18; /* Percentage */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment