trace-cmd report: Allow for multiple files without having -i

Commit Message

Steven Rostedt Jan. 24, 2024, 6:22 p.m. UTC

From: "Steven Rostedt (Google)" <[e-mail]>

If trace-cmd report is called with a single file that is not specified by
the -i option, it will report it. But if it is called with multiple files,
it will only report the first one. Allow all the trace.dat files at the
end of options to be considered files to read.

That is, currently if you have:

  trace-cmd record -e sched sleep 100
  trace-cmd split -r -m 100 -o trace-split.dat
  trace-cmd report trace-split.dat.*

It will only show the report of trace-split.dat.0001 and not the rest. To
get the rest, each one would need to be included with -i. Instead, allow
them all to be reported with the above command.

Signed-off-by: Steven Rostedt (Google) <[e-mail]>
---
 Documentation/trace-cmd/trace-cmd-report.1.txt | 2 +-
 tracecmd/trace-read.c                          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/Documentation/trace-cmd/trace-cmd-report.1.txt b/Documentation/trace-cmd/trace-cmd-report.1.txt
index ddbde811427e..62fba1e5b381 100644
--- a/Documentation/trace-cmd/trace-cmd-report.1.txt
+++ b/Documentation/trace-cmd/trace-cmd-report.1.txt
@@ -7,7 +7,7 @@  trace-cmd-report - show in ASCII a trace created by trace-cmd record
 
 SYNOPSIS
 --------
-*trace-cmd report* ['OPTIONS'] ['input-file']
+*trace-cmd report* ['OPTIONS'] ['input-file' ['input-file' ...]]
 
 DESCRIPTION
 -----------
diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
index 1dea54c44b38..beaf97a8c570 100644
--- a/tracecmd/trace-read.c
+++ b/tracecmd/trace-read.c
@@ -1806,6 +1806,10 @@  void trace_report (int argc, char **argv)
 			usage(argv);
 		input_file = argv[optind + 1];
 		add_first_input(input_file, tsoffset);
+		for (int i = optind + 2; i < argc; i++) {
+			multi_inputs++;
+			add_input(argv[i]);
+		}
 	}
 
 	if (!multi_inputs) {