From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Kim Gybels <kgybels@infogroep.be>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll
Date: Fri, 13 Apr 2018 14:36:16 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1804131433250.65@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz> (raw)
In-Reply-To: <20180412210757.7792-2-kgybels@infogroep.be>
Hi Kim,
On Thu, 12 Apr 2018, Kim Gybels wrote:
> The poll provided in compat/poll.c is not interrupted by receiving
> SIGCHLD. Use a timeout for cleaning up dead children in a timely manner.
Maybe say "When using this poll emulation, use a timeout ..."?
> diff --git a/daemon.c b/daemon.c
> index fe833ea7de..6dc95c1b2f 100644
> --- a/daemon.c
> +++ b/daemon.c
> @@ -1147,6 +1147,7 @@ static int service_loop(struct socketlist *socklist)
> {
> struct pollfd *pfd;
> int i;
> + int poll_timeout = -1;
Just reuse the line above:
int poll_timeout = -1, i;
> @@ -1161,8 +1162,13 @@ static int service_loop(struct socketlist *socklist)
> int i;
>
> check_dead_children();
> -
> - if (poll(pfd, socklist->nr, -1) < 0) {
> +#ifdef NO_POLL
> + poll_timeout = live_children ? 100 : -1;
> +#endif
> + int ret = poll(pfd, socklist->nr, poll_timeout);
> + if (ret == 0) {
> + continue;
> + } else if (ret < 0) {
I would find it a bit easier on the eyes if this did not use curlies, and
dropped the unnecessary `else` (`continue` will take care of that):
if (!ret)
continue;
if (ret < 0)
[...]
Thank you for working on this!
Ciao,
Dscho
next prev parent reply other threads:[~2018-04-13 12:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 21:07 [PATCH 0/2] Fix early EOF with GfW daemon Kim Gybels
2018-04-12 21:07 ` [PATCH 1/2] daemon: use timeout for uninterruptible poll Kim Gybels
2018-04-13 12:36 ` Johannes Schindelin [this message]
2018-04-15 17:08 ` Kim Gybels
2018-04-18 21:16 ` Johannes Schindelin
2018-04-15 21:54 ` Junio C Hamano
2018-04-15 22:16 ` Junio C Hamano
2018-04-18 21:07 ` Johannes Schindelin
2018-04-18 21:51 ` Junio C Hamano
2018-04-19 21:33 ` Kim Gybels
2018-04-19 23:18 ` Junio C Hamano
2018-04-12 21:07 ` [PATCH 2/2] daemon: graceful shutdown of client connection Kim Gybels
2018-04-13 13:03 ` Johannes Schindelin
2018-04-15 20:21 ` Kim Gybels
2018-04-18 21:48 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1804131433250.65@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kgybels@infogroep.be \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).