Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Date:   Thu, 5 Mar 2020 11:49:43 -0300
To:     Tommi Rantala <tommi.t.rantala@nokia.com>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Namhyung Kim <namhyung@kernel.org>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] perf top: Fix stdio interface input handling with
 glibc 2.28+
Message-ID: <20200305144943.GA7895@kernel.org>
References: <20200305083714.9381-1-tommi.t.rantala@nokia.com>
 <20200305083714.9381-2-tommi.t.rantala@nokia.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200305083714.9381-2-tommi.t.rantala@nokia.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Em Thu, Mar 05, 2020 at 10:37:12AM +0200, Tommi Rantala escreveu:
> Since glibc 2.28 when running 'perf top --stdio', input handling no
> longer works, but hitting any key always just prints the "Mapped keys"
> help text.
> 
> To fix it, call clearerr() in the display_thread() loop to clear any EOF
> sticky errors, as instructed in the glibc NEWS file
> (https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS):
> 
>  * All stdio functions now treat end-of-file as a sticky condition.  If you
>    read from a file until EOF, and then the file is enlarged by another
>    process, you must call clearerr or another function with the same effect
>    (e.g. fseek, rewind) before you can read the additional data.  This
>    corrects a longstanding C99 conformance bug.  It is most likely to affect
>    programs that use stdio to read interactive input from a terminal.
>    (Bug #1190.)

Thanks for fixing this, I had stumbled on it at some point, but since I
mostly use the TUI interface, it fell thru the cracks.

Do you prefer it over the TUI one?

Thanks, tested and applied.

- Arnaldo
 
> Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
> ---
>  tools/perf/builtin-top.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
> index f6dd1a63f159e..d2539b793f9d4 100644
> --- a/tools/perf/builtin-top.c
> +++ b/tools/perf/builtin-top.c
> @@ -684,7 +684,9 @@ static void *display_thread(void *arg)
>  	delay_msecs = top->delay_secs * MSEC_PER_SEC;
>  	set_term_quiet_input(&save);
>  	/* trash return*/
> -	getc(stdin);
> +	clearerr(stdin);
> +	if (poll(&stdin_poll, 1, 0) > 0)
> +		getc(stdin);
>  
>  	while (!done) {
>  		perf_top__print_sym_table(top);
> -- 
> 2.21.1
> 

-- 

- Arnaldo