redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

perf report: Pass the DSO to 'perf annotate'

Browse source 
So that we ensure that the symbol asked for annotation really is
in the DSO we are interested in.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1269459619-982-6-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-03-24 16:40:19 -03:00 committed by Ingo Molnar
parent b3c9ac0846
commit d5679ae4d2
1 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tools/perf/util/newt.c
View file

@ -157,7 +157,7 @@ static void __callchain__append_graph_browser(struct callchain_node *self,
indexes[depth + 2] = NEWT_ARG_LAST; indexes[depth + 2] = NEWT_ARG_LAST;
++chain_idx; ++chain_idx;
} }
newt_checkbox_tree__add(tree, str, chain->ms.sym, indexes); newt_checkbox_tree__add(tree, str, &chain->ms, indexes);
free(alloc_str); free(alloc_str);
++printed; ++printed;
} }
@ -193,7 +193,7 @@ static void callchain__append_graph_browser(struct callchain_node *self,
continue; continue;
str = callchain_list__sym_name(chain, ipstr, sizeof(ipstr)); str = callchain_list__sym_name(chain, ipstr, sizeof(ipstr));
newt_checkbox_tree__add(tree, str, chain->ms.sym, indexes); newt_checkbox_tree__add(tree, str, &chain->ms, indexes);
} }
indexes[1] = parent_idx; indexes[1] = parent_idx;
@ -287,14 +287,14 @@ static size_t hist_entry__append_browser(struct hist_entry *self,
indexes[0] = NEWT_ARG_APPEND; indexes[0] = NEWT_ARG_APPEND;
indexes[1] = NEWT_ARG_LAST; indexes[1] = NEWT_ARG_LAST;
newt_checkbox_tree__add(tree, s, self->ms.sym, indexes); newt_checkbox_tree__add(tree, s, &self->ms, indexes);
} else } else
newtListboxAppendEntry(tree, s, self->ms.sym); newtListboxAppendEntry(tree, s, &self->ms);
return strlen(s); return strlen(s);
} }
static void symbol__annotate_browser(const struct symbol *self) static void map_symbol__annotate_browser(const struct map_symbol *self)
{ {
FILE *fp; FILE *fp;
int cols, rows; int cols, rows;
@ -305,10 +305,11 @@ static void symbol__annotate_browser(const struct symbol *self)
size_t max_usable_width; size_t max_usable_width;
char *line = NULL; char *line = NULL;
if (self == NULL) if (self->sym == NULL)
return; return;
if (asprintf(&str, "perf annotate %s 2>&1 | expand", self->name) < 0) if (asprintf(&str, "perf annotate -d \"%s\" %s 2>&1 | expand",
self->map->dso->name, self->sym->name) < 0)
return; return;
fp = popen(str, "r"); fp = popen(str, "r");
@ -338,7 +339,7 @@ static void symbol__annotate_browser(const struct symbol *self)
newtListboxSetWidth(tree, max_line_len); newtListboxSetWidth(tree, max_line_len);
newtCenteredWindow(max_line_len + 2, rows - 5, self->name); newtCenteredWindow(max_line_len + 2, rows - 5, self->sym->name);
form = newt_form__new(); form = newt_form__new();
newtFormAddComponents(form, tree, NULL); newtFormAddComponents(form, tree, NULL);
@ -359,7 +360,7 @@ static const void *newt__symbol_tree_get_current(newtComponent self)
static void perf_session__selection(newtComponent self, void *data) static void perf_session__selection(newtComponent self, void *data)
{ {
const struct symbol **symbol_ptr = data; const struct map_symbol **symbol_ptr = data;
*symbol_ptr = newt__symbol_tree_get_current(self); *symbol_ptr = newt__symbol_tree_get_current(self);
} }
@ -376,7 +377,7 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
char str[1024]; char str[1024];
newtComponent form, tree; newtComponent form, tree;
struct newtExitStruct es; struct newtExitStruct es;
const struct symbol *selection; const struct map_symbol *selection;
snprintf(str, sizeof(str), "Samples: %Ld", session_total); snprintf(str, sizeof(str), "Samples: %Ld", session_total);
newtDrawRootText(0, 0, str); newtDrawRootText(0, 0, str);
@ -416,11 +417,8 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
int len = hist_entry__append_browser(h, tree, session_total); int len = hist_entry__append_browser(h, tree, session_total);
if (len > max_len) if (len > max_len)
max_len = len; max_len = len;
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain)
hist_entry__append_callchain_browser(h, tree, session_total, idx++); hist_entry__append_callchain_browser(h, tree, session_total, idx++);
if (idx > 3300)
break;
}
} }
if (max_len > cols) if (max_len > cols)
@ -441,14 +439,12 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
while (1) { while (1) {
char annotate[512]; char annotate[512];
const char *options[2]; const char *options[2];
int nr_options = 0, choice; int nr_options = 0, choice = 0;
newtFormRun(form, &es); newtFormRun(form, &es);
if (es.reason == NEWT_EXIT_HOTKEY) { if (es.reason == NEWT_EXIT_HOTKEY) {
if (toupper(es.u.key) == 'A') { if (toupper(es.u.key) == 'A')
symbol__annotate_browser(selection); goto do_annotate;
continue;
}
if (es.u.key == NEWT_KEY_ESCAPE || if (es.u.key == NEWT_KEY_ESCAPE ||
toupper(es.u.key) == 'Q' || toupper(es.u.key) == 'Q' ||
es.u.key == CTRL('c')) { es.u.key == CTRL('c')) {
@ -459,9 +455,9 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
} }
} }
if (selection != NULL) { if (selection->sym != NULL) {
snprintf(annotate, sizeof(annotate), snprintf(annotate, sizeof(annotate),
"Annotate %s", selection->name); "Annotate %s", selection->sym->name);
options[nr_options++] = annotate; options[nr_options++] = annotate;
} }
@ -469,8 +465,17 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
choice = popup_menu(nr_options, options); choice = popup_menu(nr_options, options);
if (choice == nr_options - 1) if (choice == nr_options - 1)
break; break;
else if (selection != NULL && choice >= 0) do_annotate:
symbol__annotate_browser(selection); if (selection->sym != NULL && choice >= 0) {
if (selection->map->dso->origin == DSO__ORIG_KERNEL) {
newtPopHelpLine();
newtPushHelpLine("No vmlinux file found, can't "
"annotate with just a "
"kallsyms file");
continue;
}
map_symbol__annotate_browser(selection);
}
} }
newtFormDestroy(form); newtFormDestroy(form);