[PATCH] perf report: Fix -T/--threads option to work again

[PATCH] perf report: Fix -T/--threads option to work again

[Namhyung Kim]

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 <namhyung@kernel.org>
---
 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 476cdf7afcca..b63aeda719be 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);
 
-- 
2.3.5

Re: [PATCH] perf report: Fix -T/--threads option to work again

[Arnaldo Carvalho de Melo]

Em Wed, Apr 29, 2015 at 09:08:48PM +0900, Namhyung Kim escreveu:
> 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.

Thanks, applied to perf/urgent.

- Arnaldo

[tip:perf/urgent] perf report: Fix -T/ --threads option to work again

[tip-bot for Namhyung Kim]

Commit-ID:  e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec
Gitweb:     http://git.kernel.org/tip/e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Wed, 29 Apr 2015 21:08:48 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1430309328-28317-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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);