From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756331AbcIVPug (ORCPT ); Thu, 22 Sep 2016 11:50:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53198 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757356AbcIVPiD (ORCPT ); Thu, 22 Sep 2016 11:38:03 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Don Zickus , Joe Mario , Ingo Molnar , Peter Zijlstra , Namhyung Kim , David Ahern , Andi Kleen Subject: [PATCH 15/57] perf c2c report: Fallback to standard dimensions Date: Thu, 22 Sep 2016 17:36:43 +0200 Message-Id: <1474558645-19956-16-git-send-email-jolsa@kernel.org> In-Reply-To: <1474558645-19956-1-git-send-email-jolsa@kernel.org> References: <1474558645-19956-1-git-send-email-jolsa@kernel.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 22 Sep 2016 15:38:03 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fallback to standard dimensions in case we don't find the dimension within c2c ones. Link: http://lkml.kernel.org/n/tip-w3yrcawal0dr1w9pcu4gyymd@git.kernel.org Signed-off-by: Jiri Olsa --- 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 6b58b537bc9d..a3481f86e2ae 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; -- 2.7.4