[tip:perf/core] perf c2c report: Fallback to standard dimensions

From: tip-bot for Jiri Olsa
Date: Sat Oct 22 2016 - 04:35:07 EST


Commit-ID: 5f2eca833cc244c6872e83fb4a5faaae1c0a87b7
Gitweb: http://git.kernel.org/tip/5f2eca833cc244c6872e83fb4a5faaae1c0a87b7
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Thu, 22 Sep 2016 17:36:43 +0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 19 Oct 2016 13:18:31 -0300

perf c2c report: Fallback to standard dimensions

Fallback to standard dimensions in case we don't find the dimension
within c2c ones.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Joe Mario <jmario@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1474558645-19956-16-git-send-email-jolsa@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-c2c.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 6b58b53..a3481f8 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -213,8 +213,10 @@ static int c2c_hists__init_output(struct perf_hpp_list *hpp_list, char *name)
{
struct c2c_fmt *c2c_fmt = get_format(name);

- if (!c2c_fmt)
- return -1;
+ if (!c2c_fmt) {
+ reset_dimensions();
+ return output_field_add(hpp_list, name);
+ }

perf_hpp_list__column_register(hpp_list, &c2c_fmt->fmt);
return 0;
@@ -224,8 +226,10 @@ static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name)
{
struct c2c_fmt *c2c_fmt = get_format(name);

- if (!c2c_fmt)
- return -1;
+ if (!c2c_fmt) {
+ reset_dimensions();
+ return sort_dimension__add(hpp_list, name, NULL, 0);
+ }

perf_hpp_list__register_sort_field(hpp_list, &c2c_fmt->fmt);
return 0;