From: Taeung Song <treeze.taeung@gmail.com>

Date: Fri, 21 Jul 2017 11:58:20 -0300

Subject: perf annotate stdio: Fix --show-total-period

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: git-fixes (depedent)

Signed-off-By: Tony Jones <tonyj@suse.de>

Git-commit: 585d93c5ffccced26689e34095c0d74ef20a07d6

Patch-mainline: v4.14-rc1

References: bsc#1070010 (git-fixes - dependency)

Signed-off-By: Tony Jones <tonyj@suse.de>

​

We were showing the total number of samples, not the total period as

asked by the user, fix it.

​

Reported-by: Namhyung Kim <namhyung@kernel.org>

Cc: Jiri Olsa <jolsa@redhat.com>

Cc: Martin Liška <mliska@suse.cz>

Cc: Milian Wolff <milian.wolff@kdab.com>

Link: http://lkml.kernel.org/n/tip-lh2nh89rtqn5x5vbfthw6qml@git.kernel.org

Fixes: 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")

[ split from a larger patch ]

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

---

 tools/perf/util/annotate.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

​

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c

index 00e085fc945b..004072f82511 100644

--- a/tools/perf/util/annotate.c

+++ b/tools/perf/util/annotate.c

@@ -1143,7 +1143,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st

            if (symbol_conf.show_total_period)

                color_fprintf(stdout, color, " %7" PRIu64,

-                         sample.nr_samples);

+                         sample.period);

            else

                color_fprintf(stdout, color, " %7.2f", percent);

        }

​

​