Commit 8f0b0373 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar

perf annotate: Remove requirement of passing a symbol name

If the user doesn't pass a symbol name to annotate, it will
annotate all the symbols that have hits, in order, just like
'perf report -s comm,dso,symbol'.

This is a natural followup patch to the one that uses
output_hists to find the symbols with hits.

The common case is to annotate the first few entries at the top
of a perf report, so lets type less characters.
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1256058509-19678-1-git-send-email-acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e4204992
...@@ -57,7 +57,8 @@ static const char *sym_hist_filter; ...@@ -57,7 +57,8 @@ static const char *sym_hist_filter;
static int symbol_filter(struct map *map, struct symbol *sym) static int symbol_filter(struct map *map, struct symbol *sym)
{ {
if (strcmp(sym->name, sym_hist_filter) == 0) { if (sym_hist_filter == NULL ||
strcmp(sym->name, sym_hist_filter) == 0) {
struct sym_priv *priv = dso__sym_priv(map->dso, sym); struct sym_priv *priv = dso__sym_priv(map->dso, sym);
const int size = (sizeof(*priv->hist) + const int size = (sizeof(*priv->hist) +
(sym->end - sym->start) * sizeof(u64)); (sym->end - sym->start) * sizeof(u64));
...@@ -581,7 +582,6 @@ static void annotate_sym(struct hist_entry *he) ...@@ -581,7 +582,6 @@ static void annotate_sym(struct hist_entry *he)
static void find_annotations(void) static void find_annotations(void)
{ {
struct rb_node *nd; struct rb_node *nd;
int count = 0;
for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) { for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) {
struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node); struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);
...@@ -595,7 +595,6 @@ static void find_annotations(void) ...@@ -595,7 +595,6 @@ static void find_annotations(void)
continue; continue;
annotate_sym(he); annotate_sym(he);
count++;
/* /*
* Since we have a hist_entry per IP for the same symbol, free * Since we have a hist_entry per IP for the same symbol, free
* he->sym->hist to signal we already processed this symbol. * he->sym->hist to signal we already processed this symbol.
...@@ -603,9 +602,6 @@ static void find_annotations(void) ...@@ -603,9 +602,6 @@ static void find_annotations(void)
free(priv->hist); free(priv->hist);
priv->hist = NULL; priv->hist = NULL;
} }
if (!count)
printf(" Error: symbol '%s' not present amongst the samples.\n", sym_hist_filter);
} }
static int __cmd_annotate(void) static int __cmd_annotate(void)
...@@ -793,9 +789,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) ...@@ -793,9 +789,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
sym_hist_filter = argv[0]; sym_hist_filter = argv[0];
} }
if (!sym_hist_filter)
usage_with_options(annotate_usage, options);
setup_pager(); setup_pager();
if (field_sep && *field_sep == '.') { if (field_sep && *field_sep == '.') {
......
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