| From 0b8508fc89cf51893340cdc1bffaee200172e532 Mon Sep 17 00:00:00 2001 |
| From: Jiri Olsa <jolsa@kernel.org> |
| Date: Tue, 5 Nov 2019 00:27:11 +0100 |
| Subject: [PATCH] perf tools: Fix time sorting |
| |
| commit 722ddfde366fd46205456a9c5ff9b3359dc9a75e upstream. |
| |
| The final sort might get confused when the comparison is done over |
| bigger numbers than int like for -s time. |
| |
| Check the following report for longer workloads: |
| |
| $ perf report -s time -F time,overhead --stdio |
| |
| Fix hist_entry__sort() to properly return int64_t and not possible cut |
| int. |
| |
| Fixes: 043ca389a318 ("perf tools: Use hpp formats to sort final output") |
| Signed-off-by: Jiri Olsa <jolsa@kernel.org> |
| Reviewed-by: Andi Kleen <ak@linux.intel.com> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Michael Petlan <mpetlan@redhat.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: stable@vger.kernel.org # v3.16+ |
| Link: http://lore.kernel.org/lkml/20191104232711.16055-1-jolsa@kernel.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c |
| index 966c248d6a3a..06d2981f0855 100644 |
| --- a/tools/perf/util/hist.c |
| +++ b/tools/perf/util/hist.c |
| @@ -1581,7 +1581,7 @@ int hists__collapse_resort(struct hists *hists, struct ui_progress *prog) |
| return 0; |
| } |
| |
| -static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b) |
| +static int64_t hist_entry__sort(struct hist_entry *a, struct hist_entry *b) |
| { |
| struct hists *hists = a->hists; |
| struct perf_hpp_fmt *fmt; |
| -- |
| 2.7.4 |
| |