perf annotate: Remove requirement of passing a symbol name
PATCH 1/1 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.
--- tools/perf/builtin-annotate.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-)
tools/perf/builtin-annotate.c +2 -9
@@ -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));
@@ -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);
@@ -595,7 +595,6 @@ 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.
@@ -603,9 +602,6 @@ static void find_annotations(void)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 )
@@ -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 =='.' ) {
Signature · 1 line
1.5.5.1
Commit-ID: 8f0b037398a909ccf703ad5f5803066db6327f22 Gitweb: http://git.kernel.org/tip/8f0b037398a909ccf703ad5f5803066db6327f22 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 20 Oct 2009 15:08:29 -0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 20 Oct 2009 21:12:58 +0200
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.
LKML-Reference: <[email protected]>
--- tools/perf/builtin-annotate.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-)
tools/perf/builtin-annotate.c +2 -9
@@ -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));
@@ -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);
@@ -595,7 +595,6 @@ 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.
@@ -603,9 +602,6 @@ static void find_annotations(void)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 )
@@ -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 =='.' ) {