From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756171AbcJVIfE (ORCPT ); Sat, 22 Oct 2016 04:35:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56760 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbcJVIfB (ORCPT ); Sat, 22 Oct 2016 04:35:01 -0400 Date: Sat, 22 Oct 2016 01:34:47 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, andi@firstfloor.org, dzickus@redhat.com, hpa@zytor.com, jolsa@kernel.org, jmario@redhat.com, mingo@kernel.org, a.p.zijlstra@chello.nl Reply-To: tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, dzickus@redhat.com, andi@firstfloor.org, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, jmario@redhat.com, a.p.zijlstra@chello.nl In-Reply-To: <1474558645-19956-16-git-send-email-jolsa@kernel.org> References: <1474558645-19956-16-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf c2c report: Fallback to standard dimensions Git-Commit-ID: 5f2eca833cc244c6872e83fb4a5faaae1c0a87b7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5f2eca833cc244c6872e83fb4a5faaae1c0a87b7 Gitweb: http://git.kernel.org/tip/5f2eca833cc244c6872e83fb4a5faaae1c0a87b7 Author: Jiri Olsa AuthorDate: Thu, 22 Sep 2016 17:36:43 +0200 Committer: Arnaldo Carvalho de Melo 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 Cc: Andi Kleen Cc: David Ahern Cc: Don Zickus Cc: Joe Mario Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1474558645-19956-16-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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;