From: Kim Gybels <kgybels@infogroep.be>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Jeff King <peff@peff.net>, Kim Gybels <kgybels@infogroep.be>
Subject: [PATCH 1/2] daemon: use timeout for uninterruptible poll
Date: Thu, 12 Apr 2018 23:07:56 +0200 [thread overview]
Message-ID: <20180412210757.7792-2-kgybels@infogroep.be> (raw)
In-Reply-To: <20180412210757.7792-1-kgybels@infogroep.be>
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.
Signed-off-by: Kim Gybels <kgybels@infogroep.be>
---
daemon.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
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;
pfd = xcalloc(socklist->nr, sizeof(struct pollfd));
@@ -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) {
if (errno != EINTR) {
logerror("Poll failed, resuming: %s",
strerror(errno));
--
2.17.0.windows.1
next prev parent reply other threads:[~2018-04-12 21:24 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 ` Kim Gybels [this message]
2018-04-13 12:36 ` [PATCH 1/2] daemon: use timeout for uninterruptible poll Johannes Schindelin
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=20180412210757.7792-2-kgybels@infogroep.be \
--to=kgybels@infogroep.be \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--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).