diff options
author | Jiri Olsa <jolsa@kernel.org> | 2014-10-16 10:07:01 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-29 08:27:56 -0400 |
commit | 49f4744307f9718d8e100755110b3b7b40ec4237 (patch) | |
tree | 523ae45788f0bd80d5a5c73b10d8dff4b855f544 /tools | |
parent | 493c3031336a49bbd50777dc2adfa52a49933d43 (diff) |
perf tools: Fix report -F abort for data without branch info
The branch field sorting code assumes hist_entry::branch_info is
allocated, which is wrong and following perf session ends up with report
segfault.
$ perf record ls
$ perf report -F abort
perf: Segmentation fault
Checking that hist_entry::branch_info is valid and display "N/A" string
in snprint callback if it's not.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1413468427-31049-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/sort.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 4906cd81cb56..82241fe54e4b 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c | |||
@@ -989,6 +989,9 @@ struct sort_entry sort_mem_dcacheline = { | |||
989 | static int64_t | 989 | static int64_t |
990 | sort__abort_cmp(struct hist_entry *left, struct hist_entry *right) | 990 | sort__abort_cmp(struct hist_entry *left, struct hist_entry *right) |
991 | { | 991 | { |
992 | if (!left->branch_info || !right->branch_info) | ||
993 | return cmp_null(left->branch_info, right->branch_info); | ||
994 | |||
992 | return left->branch_info->flags.abort != | 995 | return left->branch_info->flags.abort != |
993 | right->branch_info->flags.abort; | 996 | right->branch_info->flags.abort; |
994 | } | 997 | } |
@@ -996,10 +999,15 @@ sort__abort_cmp(struct hist_entry *left, struct hist_entry *right) | |||
996 | static int hist_entry__abort_snprintf(struct hist_entry *he, char *bf, | 999 | static int hist_entry__abort_snprintf(struct hist_entry *he, char *bf, |
997 | size_t size, unsigned int width) | 1000 | size_t size, unsigned int width) |
998 | { | 1001 | { |
999 | static const char *out = "."; | 1002 | static const char *out = "N/A"; |
1003 | |||
1004 | if (he->branch_info) { | ||
1005 | if (he->branch_info->flags.abort) | ||
1006 | out = "A"; | ||
1007 | else | ||
1008 | out = "."; | ||
1009 | } | ||
1000 | 1010 | ||
1001 | if (he->branch_info->flags.abort) | ||
1002 | out = "A"; | ||
1003 | return repsep_snprintf(bf, size, "%-*s", width, out); | 1011 | return repsep_snprintf(bf, size, "%-*s", width, out); |
1004 | } | 1012 | } |
1005 | 1013 | ||