Commit 026334a3 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf inject: Fix repipe usage 



Since commit 14d3d540 ("perf session: Try to read pipe data from
file") 'perf inject' has started printing "PERFILE2h" when not processing
pipes.

The commit exposed perf to the possiblity that the input is not a pipe
but the 'repipe' parameter gets used. That causes the printing because
perf inject sets 'repipe' to true always.

The 'repipe' parameter of perf_session__new() is used by 2 functions:

	- perf_file_header__read_pipe()
	- trace_report()

In both cases, the functions copy data to STDOUT_FILENO when 'repipe' is
true.

Fix by setting 'repipe' to true only if the output is a pipe.

Fixes: e558a5bd ("perf inject: Work with files")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andrew Vagin <avagin@openvz.org>
Link: http://lore.kernel.org/lkml/20210401103605.9000-1-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e49d033b

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ int cmd_inject(int argc, const char **argv) 
	}



	data.path = inject.input_name;

	inject.session = perf_session__new(&data, true, &inject.tool);

	inject.session = perf_session__new(&data, inject.output.is_pipe, &inject.tool);

	if (IS_ERR(inject.session))

		return PTR_ERR(inject.session);