From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752024AbcEJNRR (ORCPT ); Tue, 10 May 2016 09:17:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43357 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbcEJNRQ (ORCPT ); Tue, 10 May 2016 09:17:16 -0400 Date: Tue, 10 May 2016 15:17:12 +0200 From: Jiri Olsa To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , "stable # 4 . 5" Subject: Re: [PATCH] perf diff: Fix duplicated output column Message-ID: <20160510131712.GA23071@krava> References: <1462884499-6612-1-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1462884499-6612-1-git-send-email-namhyung@kernel.org> User-Agent: Mutt/1.6.1 (2016-04-27) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 10 May 2016 13:17:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 10, 2016 at 09:48:19PM +0900, Namhyung Kim wrote: > The commit b97511c5bc94 ("perf tools: Add overhead/overhead_children > keys defaults via string") moved initialization of column headers but it > missed to check the sort__mode. As 'perf diff' doesn't call > perf_hpp__init(), the setup_overhead() also should not be called. > > Before: > > # Baseline Delta Children Overhead Shared Object Symbol > # ........ ....... ........ ........ ................... ....................... > # > 28.48% -28.47% 28.48% 28.48% [kernel.vmlinux ] [k] intel_idle > 11.51% -11.47% 11.51% 11.51% libxul.so [.] 0x0000000001a360f7 > 3.49% -3.49% 3.49% 3.49% [kernel.vmlinux] [k] generic_exec_single > 2.91% -2.89% 2.91% 2.91% libdbus-1.so.3.8.11 [.] 0x000000000000cdc2 > 2.86% -2.85% 2.86% 2.86% libxcb.so.1.1.0 [.] 0x000000000000c890 > 2.44% -2.39% 2.44% 2.44% [kernel.vmlinux] [k] perf_event_aux_ctx > > After: > > # Baseline Delta Shared Object Symbol > # ........ ....... ................... ....................... > # > 28.48% -28.47% [kernel.vmlinux] [k] intel_idle > 11.51% -11.47% libxul.so [.] 0x0000000001a360f7 > 3.49% -3.49% [kernel.vmlinux] [k] generic_exec_single > 2.91% -2.89% libdbus-1.so.3.8.11 [.] 0x000000000000cdc2 > 2.86% -2.85% libxcb.so.1.1.0 [.] 0x000000000000c890 > 2.44% -2.39% [kernel.vmlinux] [k] perf_event_aux_ctx > > Cc: stable # 4.5 > Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/util/sort.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c > index 772e2e461ec3..20e69edd5006 100644 > --- a/tools/perf/util/sort.c > +++ b/tools/perf/util/sort.c > @@ -2438,6 +2438,9 @@ static char *prefix_if_not_in(const char *pre, char *str) > > static char *setup_overhead(char *keys) > { > + if (sort__mode == SORT_MODE__DIFF) > + return keys; > + > keys = prefix_if_not_in("overhead", keys); > > if (symbol_conf.cumulate_callchain) > -- > 2.8.2 >