Skip to contentSkip to conversation

perf report: Switch data file correctly in TUI

PATCH Applied Namhyung Kim 1 participant 3 messages Feb 11, 2025 – Feb 20, 2025 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/2 perf report: Switch data file correctly in TUI

The 's' key is to switch to a new data file and load the data in the same window. The switch_data_file() will show a popup menu to select which data file user wants and update the 'input_name' global variable.

But in the cmd_report(), it didn't update the data.path using the new 'input_name' and keep usng the old file. This is fairly an old bug and I assume people don't use this feature much. :)

Fixes f5fc14124c5cefdd ("perf tools: Add data object to handle perf data file")
---
 tools/perf/builtin-report.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-report.c +1 -1
index f5fbd670d619a32a..c99b14a852dbdfbb 100644
@@ -1553,12 +1553,12 @@ int cmd_report(int argc, const char **argv)
 			input_name = "perf.data";
 	}
 
+repeat:
 	data.path  = input_name;
 	data.force = symbol_conf.force;
 
 	symbol_conf.skip_empty = report.skip_empty;
 
-repeat:
 	perf_tool__init(&report.tool, ordered_events);
 	report.tool.sample		 = process_sample_event;
 	report.tool.mmap		 = perf_event__process_mmap;
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
author maintainer
#1 lore raw

PATCH 2/2 perf report: Support switching data w/ and w/o callchains

The symbol_conf.use_callchain should be reset when switching to new data file, otherwise report__setup_sample_type() will show an error message that it enabled callchains but no callchain data. The function also will turn on the callchains if the data has PERF_SAMPLE_CALLCHAIN so I think it's ok to reset symbol_conf.use_callchain here.

---
 tools/perf/builtin-report.c | 5 +++++
 1 file changed, 5 insertions(+)
tools/perf/builtin-report.c +5 -0
index c99b14a852dbdfbb..e7a7e9df1b42b3a7 100644
@@ -1826,6 +1826,11 @@ int cmd_report(int argc, const char **argv)
 	if (ret == K_SWITCH_INPUT_DATA || ret == K_RELOAD) {
 		perf_session__delete(session);
 		last_key = K_SWITCH_INPUT_DATA;
+		/*
+		 * To support switching between data with and without callchains.
+		 * report__setup_sample_type() will update it properly.
+		 */
+		symbol_conf.use_callchain = false;
 		goto repeat;
 	} else
 		ret = 0;
Signature · 1 line
2.48.1.502.g6dc24dfdaf-goog
author maintainer Applied
#2 lore raw
In reply to Namhyung Kim
Quoted 9 lines · Namhyung Kim

The 's' key is to switch to a new data file and load the data in the same window. The switch_data_file() will show a popup menu to select which data file user wants and update the 'input_name' global variable.

But in the cmd_report(), it didn't update the data.path using the new 'input_name' and keep usng the old file. This is fairly an old bug and I assume people don't use this feature much. :)

[...]

Applied to perf-tools-next, thanks!

Best regards,
Namhyung