Skip to content

Commit

Permalink
perf annotate: Remove requirement of passing a symbol name
Browse files Browse the repository at this point in the history
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: Arnaldo 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: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Oct 20, 2009
1 parent e420499 commit 8f0b037
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions tools/perf/builtin-annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ static const char *sym_hist_filter;

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);
const int size = (sizeof(*priv->hist) +
(sym->end - sym->start) * sizeof(u64));
Expand Down Expand Up @@ -581,7 +582,6 @@ static void annotate_sym(struct hist_entry *he)
static void find_annotations(void)
{
struct rb_node *nd;
int count = 0;

for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) {
struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);
Expand All @@ -595,17 +595,13 @@ static void find_annotations(void)
continue;

annotate_sym(he);
count++;
/*
* Since we have a hist_entry per IP for the same symbol, free
* he->sym->hist to signal we already processed this symbol.
*/
free(priv->hist);
priv->hist = NULL;
}

if (!count)
printf(" Error: symbol '%s' not present amongst the samples.\n", sym_hist_filter);
}

static int __cmd_annotate(void)
Expand Down Expand Up @@ -793,9 +789,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
sym_hist_filter = argv[0];
}

if (!sym_hist_filter)
usage_with_options(annotate_usage, options);

setup_pager();

if (field_sep && *field_sep == '.') {
Expand Down

0 comments on commit 8f0b037

Please sign in to comment.