Commit 0feba17b authored Dec 20, 2019 by Jin Yao Committed by Arnaldo Carvalho de Melo Dec 20, 2019

perf report: Fix incorrectly added dimensions as switch perf data file



We observed an issue that was some extra columns displayed after switching
perf data file in browser. The steps to reproduce:

1. perf record -a -e cycles,instructions -- sleep 3
2. perf report --group
3. In browser, we use hotkey 's' to switch to another perf.data
4. Now in browser, the extra columns 'Self' and 'Children' are displayed.

The issue is setup_sorting() executed again after repeat path, so dimensions
are added again.

This patch checks the last key returned from __cmd_report(). If it's
K_SWITCH_INPUT_DATA, skips the setup_sorting().

Fixes: ad0de097 ("perf report: Enable the runtime switching of perf data file")
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20191220013722.20592-1-yao.jin@linux.intel.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent f84ae29a

tools/perf/builtin-report.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1076,6 +1076,7 @@ int cmd_report(int argc, const char **argv)
		struct stat st;
		bool has_br_stack = false;
		int branch_mode = -1;
		int last_key = 0;
		bool branch_call_mode = false;
		#define CALLCHAIN_DEFAULT_OPT "graph,0.5,caller,function,percent"
		static const char report_callchain_help[] = "Display call graph (stack chain/backtrace):\n\n"
		@@ -1450,7 +1451,8 @@ repeat:
		sort_order = sort_tmp;
		}

		if (setup_sorting(session->evlist) < 0) {
		if ((last_key != K_SWITCH_INPUT_DATA) &&
		(setup_sorting(session->evlist) < 0)) {
		if (sort_order)
		parse_options_usage(report_usage, options, "s", 1);
		if (field_order)
		@@ -1530,6 +1532,7 @@ repeat:
		ret = __cmd_report(&report);
		if (ret == K_SWITCH_INPUT_DATA) {
		perf_session__delete(session);
		last_key = K_SWITCH_INPUT_DATA;
		goto repeat;
		} else
		ret = 0;

Admin message