perf annotate TUI: Use sym_hist_entry in disasm_line_samples

Just paving the way to fix --show-total-period in the TUI, i.e. now
we save in struct disasm_line_samples not just the number of samples,
but also the total period.

Based-on-a-patch-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-1sup5hkwrxocjvrmrmhs732o@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index dbe4e630b90f84c1999ee6820cd99388dfbc240b..680fff70f7a0c4d7d17c1db70b5a5bc6edd8ff42 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -17,8 +17,8 @@
 #include <sys/ttydefaults.h>
 
 struct disasm_line_samples {
-       double          percent;
-       u64             nr;
+       double                percent;
+       struct sym_hist_entry he;
 };
 
 #define IPC_WIDTH 6
@@ -152,7 +152,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                                                current_entry);
                        if (annotate_browser__opts.show_total_period) {
                                ui_browser__printf(browser, "%6" PRIu64 " ",
-                                                  bdl->samples[i].nr);
+                                                  bdl->samples[i].he.nr_samples);
                        } else {
                                ui_browser__printf(browser, "%6.2f ",
                                                   bdl->samples[i].percent);
@@ -457,7 +457,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
                                                pos->offset,
                                                next ? next->offset : len,
                                                &path, &sample);
-                       bpos->samples[i].nr = sample.nr_samples;
+                       bpos->samples[i].he = sample;
 
                        if (max_percent < bpos->samples[i].percent)
                                max_percent = bpos->samples[i].percent;