From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757190AbbEFEhY (ORCPT ); Wed, 6 May 2015 00:37:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37425 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184AbbEFEhU (ORCPT ); Wed, 6 May 2015 00:37:20 -0400 Date: Tue, 5 May 2015 21:36:40 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: acme@redhat.com, eranian@google.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, a.p.zijlstra@chello.nl, andi@firstfloor.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, jolsa@redhat.com Reply-To: hpa@zytor.com, tglx@linutronix.de, jolsa@redhat.com, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, eranian@google.com, linux-kernel@vger.kernel.org, andi@firstfloor.org, a.p.zijlstra@chello.nl, mingo@kernel.org In-Reply-To: <1430309328-28317-1-git-send-email-namhyung@kernel.org> References: <1430309328-28317-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf report: Fix -T/ --threads option to work again Git-Commit-ID: e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec 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: e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec Gitweb: http://git.kernel.org/tip/e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec Author: Namhyung Kim AuthorDate: Wed, 29 Apr 2015 21:08:48 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 1 May 2015 10:13:30 -0300 perf report: Fix -T/--threads option to work again The commit 512ae1bd6acb ("perf tools: Consolidate management of default sort orders") changed default value of the 'sort_order' variable to NULL indicating that users don't set any sort keys on the command line. However it missed to update a check in perf_evlist__tty_browse_hists() so that 'perf report -T' cannot show the per-thread values after the normal output. This patch fixes it to work again. Note that the -T option only works on --stdio and neither --sort nor --parent option was given. Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1430309328-28317-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 476cdf7..b63aeda 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -329,7 +329,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, fprintf(stdout, "\n\n"); } - if (sort_order == default_sort_order && + if (sort_order == NULL && parent_pattern == default_parent_pattern) { fprintf(stdout, "#\n# (%s)\n#\n", help);