perf hists browser: Allow annotating entries in callchains

Instead of annotating just the top level hist_entry, allow instead
annotating a map_symbol, i.e. the top level hist_entry or one of the
callchains for which there were samples.

Suggested-by: Stephane Eranian <eranian@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-k1zxj5564je9jei4yd15ouwn@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2 files changed, 17 insertions, 14 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 9d32e3c0cfee..e5250eb2dd57 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -829,10 +829,16 @@ out:
         return key;
 }
 
+int map_symbol__tui_annotate(struct map_symbol *ms, struct perf_evsel *evsel,
+                             struct hist_browser_timer *hbt)
+{
+        return symbol__tui_annotate(ms->sym, ms->map, evsel, hbt);
+}
+
 int hist_entry__tui_annotate(struct hist_entry *he, struct perf_evsel *evsel,
                              struct hist_browser_timer *hbt)
 {
-        return symbol__tui_annotate(he->ms.sym, he->ms.map, evsel, hbt);
+        return map_symbol__tui_annotate(&he->ms, evsel, hbt);
 }
 
 static void annotate_browser__mark_jump_targets(struct annotate_browser *browser,
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index c37e70ae0b20..cd7350aeb8e7 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1704,6 +1704,7 @@ retry_popup_menu:
                 if (choice == annotate || choice == annotate_t || choice == annotate_f) {
                         struct hist_entry *he;
                         struct annotation *notes;
+                        struct map_symbol ms;
                         int err;
 do_annotate:
                         if (!objdump_path && perf_session_env__lookup_objdump(env))
@@ -1713,25 +1714,21 @@ do_annotate:
                         if (he == NULL)
                                 continue;
 
-                        /*
-                         * we stash the branch_info symbol + map into the
-                         * the ms so we don't have to rewrite all the annotation
-                         * code to use branch_info.
-                         * in branch mode, the ms struct is not used
-                         */
                         if (choice == annotate_f) {
-                                he->ms.sym = he->branch_info->from.sym;
-                                he->ms.map = he->branch_info->from.map;
-                        }  else if (choice == annotate_t) {
-                                he->ms.sym = he->branch_info->to.sym;
-                                he->ms.map = he->branch_info->to.map;
+                                ms.map = he->branch_info->from.map;
+                                ms.sym = he->branch_info->from.sym;
+                        } else if (choice == annotate_t) {
+                                ms.map = he->branch_info->to.map;
+                                ms.sym = he->branch_info->to.sym;
+                        } else {
+                                ms = *browser->selection;
                         }
 
-                        notes = symbol__annotation(he->ms.sym);
+                        notes = symbol__annotation(ms.sym);
                         if (!notes->src)
                                 continue;
 
-                        err = hist_entry__tui_annotate(he, evsel, hbt);
+                        err = map_symbol__tui_annotate(&ms, evsel, hbt);
                         /*
                          * offer option to annotate the other branch source or target
                          * (if they exists) when returning from annotate