Skip to content

Commit de65c30

Browse files
namhyunggregkh
authored andcommitted
perf diff: Fix segfault on 'perf diff -o N' option
commit 8381cdd upstream. The -o/--order option is to select column number to sort a diff result. It does the job by adding a hpp field at the beginning of the sort list. But it should not be added to the output field list as it has no callbacks required by a output field. During the setup_sorting(), the perf_hpp__setup_output_field() appends the given sort keys to the output field if it's not there already. Originally it was checked by fmt->list being non-empty. But commit 3f931f2 ("perf hists: Make hpp setup function generic") changed it to check the ->equal callback. Anyways, we don't need to add the pseudo hpp field to the output field list since it won't be used for output. So just skip fields if they have no ->color or ->entry callbacks. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Fixes: 3f931f2 ("perf hists: Make hpp setup function generic") Link: http://lkml.kernel.org/r/20170118051457.30946-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 85df621 commit de65c30

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tools/perf/ui/hist.c

+4
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,10 @@ void perf_hpp__setup_output_field(struct perf_hpp_list *list)
566566
perf_hpp_list__for_each_sort_list(list, fmt) {
567567
struct perf_hpp_fmt *pos;
568568

569+
/* skip sort-only fields ("sort_compute" in perf diff) */
570+
if (!fmt->entry && !fmt->color)
571+
continue;
572+
569573
perf_hpp_list__for_each_format(list, pos) {
570574
if (fmt_equal(fmt, pos))
571575
goto next;

0 commit comments

Comments
 (0)