From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768AbbEOGpW (ORCPT ); Fri, 15 May 2015 02:45:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58228 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754034AbbEOGpT (ORCPT ); Fri, 15 May 2015 02:45:19 -0400 Date: Thu, 14 May 2015 23:45:03 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: jolsa@redhat.com, dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: dsahern@gmail.com, jolsa@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, acme@redhat.com, namhyung@kernel.org In-Reply-To: <1431351879-23798-1-git-send-email-namhyung@kernel.org> References: <1431351879-23798-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Do not restrict -T option by other options Git-Commit-ID: 021162cf02fcfa80cbae5f3b7304e9cb392962eb 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: 021162cf02fcfa80cbae5f3b7304e9cb392962eb Gitweb: http://git.kernel.org/tip/021162cf02fcfa80cbae5f3b7304e9cb392962eb Author: Namhyung Kim AuthorDate: Mon, 11 May 2015 22:44:39 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 May 2015 09:59:51 -0300 perf report: Do not restrict -T option by other options It seems there's no reason to suppress per-thread event stat by -T option when -s or -p option is used. Make it work with those options. Signed-off-by: Namhyung Kim Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1431351879-23798-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 4d642db..92fca21 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -333,15 +333,14 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, } if (sort_order == NULL && - parent_pattern == default_parent_pattern) { + parent_pattern == default_parent_pattern) fprintf(stdout, "#\n# (%s)\n#\n", help); - if (rep->show_threads) { - bool style = !strcmp(rep->pretty_printing_style, "raw"); - perf_read_values_display(stdout, &rep->show_threads_values, - style); - perf_read_values_destroy(&rep->show_threads_values); - } + if (rep->show_threads) { + bool style = !strcmp(rep->pretty_printing_style, "raw"); + perf_read_values_display(stdout, &rep->show_threads_values, + style); + perf_read_values_destroy(&rep->show_threads_values); } return 0;