From: Jiri Olsa <jolsa@redhat.com>
To: Igor Lubashev <ilubashe@akamai.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Jiri Olsa <jolsa@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/3] perf kvm: Allow running without stdin
Date: Wed, 23 Oct 2019 12:42:45 +0200 [thread overview]
Message-ID: <20191023104245.GL22919@krava> (raw)
In-Reply-To: <1571795693-23558-3-git-send-email-ilubashe@akamai.com>
On Tue, Oct 22, 2019 at 09:54:52PM -0400, Igor Lubashev wrote:
> Allow perf kvm --stdio to run without access to stdin.
> This lets perf kvm to run in a batch mode until interrupted.
>
> The following now works as expected:
>
> $ perf kvm top --stdio < /dev/null
>
> Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
> ---
> tools/perf/builtin-kvm.c | 33 ++++++++++++++++++++-------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
> index 858da896b518..5217aa3596c7 100644
> --- a/tools/perf/builtin-kvm.c
> +++ b/tools/perf/builtin-kvm.c
> @@ -930,18 +930,20 @@ static int fd_set_nonblock(int fd)
>
> static int perf_kvm__handle_stdin(void)
> {
> - int c;
> -
> - c = getc(stdin);
> - if (c == 'q')
> + switch (getc(stdin)) {
> + case 'q':
> + done = 1;
> return 1;
> -
> - return 0;
> + case EOF:
> + return 0;
> + default:
> + return 1;
> + }
> }
>
> static int kvm_events_live_report(struct perf_kvm_stat *kvm)
> {
> - int nr_stdin, ret, err = -EINVAL;
> + int nr_stdin = -1, ret, err = -EINVAL;
> struct termios save;
>
> /* live flag must be set first */
> @@ -972,13 +974,16 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)
> if (evlist__add_pollfd(kvm->evlist, kvm->timerfd) < 0)
> goto out;
>
> - nr_stdin = evlist__add_pollfd(kvm->evlist, fileno(stdin));
> - if (nr_stdin < 0)
> - goto out;
> -
> if (fd_set_nonblock(fileno(stdin)) != 0)
> goto out;
>
> + /* add stdin, if it is connected */
> + if (getc(stdin) != EOF) {
> + nr_stdin = evlist__add_pollfd(kvm->evlist, fileno(stdin));
> + if (nr_stdin < 0)
> + goto out;
> + }
> +
> /* everything is good - enable the events and process */
> evlist__enable(kvm->evlist);
>
> @@ -994,8 +999,10 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)
> if (err)
> goto out;
>
> - if (fda->entries[nr_stdin].revents & POLLIN)
> - done = perf_kvm__handle_stdin();
> + if (nr_stdin >= 0 && fda->entries[nr_stdin].revents & POLLIN) {
> + if (!perf_kvm__handle_stdin())
can this return 0 ? if stdin is EOF then nr_stdin stays -1
> + fda->entries[nr_stdin].events = 0;
why do you need to set events to 0 in here?
thanks,
jirka
next prev parent reply other threads:[~2019-10-23 10:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 1:54 [PATCH 0/3] perf: Allow running without stdin Igor Lubashev
2019-10-23 1:54 ` [PATCH 1/3] perf top: " Igor Lubashev
2019-10-23 1:54 ` [PATCH 2/3] perf kvm: " Igor Lubashev
2019-10-23 10:42 ` Jiri Olsa [this message]
2019-10-23 16:06 ` Lubashev, Igor
2019-11-08 19:55 ` Lubashev, Igor
2019-10-23 1:54 ` [PATCH 3/3] perf kvm: Use evlist layer api when possible Igor Lubashev
2019-10-23 12:58 ` Arnaldo Carvalho de Melo
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Igor Lubashev
2019-10-24 8:24 ` [PATCH 0/3] perf: Allow running without stdin Jiri Olsa
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=20191023104245.GL22919@krava \
--to=jolsa@redhat.com \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=ilubashe@akamai.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).