From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756081AbaE2EAv (ORCPT ); Thu, 29 May 2014 00:00:51 -0400 Received: from LGEMRELSE6Q.lge.com ([156.147.1.121]:53456 "EHLO lgemrelse6q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932298AbaE2D6i (ORCPT ); Wed, 28 May 2014 23:58:38 -0400 X-Original-SENDERIP: 10.177.220.181 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Peter Zijlstra , Ingo Molnar , Paul Mackerras , Namhyung Kim , Namhyung Kim , LKML , David Ahern , Frederic Weisbecker , Andi Kleen , Arun Sharma , Rodrigo Campos , Don Zickus Subject: [PATCH 17/27] perf tools: Do not auto-remove Children column if --fields given Date: Thu, 29 May 2014 12:58:20 +0900 Message-Id: <1401335910-16832-18-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1401335910-16832-1-git-send-email-namhyung@kernel.org> References: <1401335910-16832-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Depending on the configuration perf inserts/removes the Children column in the output automatically. But it might not be what user wants if [s]he give --fields option explicitly. Tested-by: Rodrigo Campos Cc: Arun Sharma Cc: Frederic Weisbecker Signed-off-by: Namhyung Kim --- tools/perf/ui/hist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 8ca638754acc..498adb23c02e 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -513,6 +513,9 @@ void perf_hpp__column_disable(unsigned col) void perf_hpp__cancel_cumulate(void) { + if (field_order) + return; + perf_hpp__column_disable(PERF_HPP__OVERHEAD_ACC); perf_hpp__format[PERF_HPP__OVERHEAD].header = hpp__header_overhead; } -- 1.9.2