public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf inject: Fix repipe usage
Date: Thu, 1 Apr 2021 16:05:13 +0200	[thread overview]
Message-ID: <YGXTGQwbz0wOWplZ@krava> (raw)
In-Reply-To: <20210401103605.9000-1-adrian.hunter@intel.com>

On Thu, Apr 01, 2021 at 01:36:05PM +0300, Adrian Hunter wrote:
> Since commit 14d3d5405253 ("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: e558a5bd8b74 ("perf inject: Work with files")
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Acked-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka

> ---
>  tools/perf/builtin-inject.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
> index 6fe44d97fde5..ddccc0eb7390 100644
> --- a/tools/perf/builtin-inject.c
> +++ b/tools/perf/builtin-inject.c
> @@ -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);
>  
> -- 
> 2.17.1
> 


  reply	other threads:[~2021-04-01 18:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-01 10:36 [PATCH] perf inject: Fix repipe usage Adrian Hunter
2021-04-01 14:05 ` Jiri Olsa [this message]
2021-04-02 13:33   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YGXTGQwbz0wOWplZ@krava \
    --to=jolsa@redhat.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox