From 6aee474574e0aff10602a6fd17d37826b04a996d Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 11 Apr 2012 10:12:14 +0100
Subject: [PATCH] Disable the timer signal while blocked in select() (#5991)
The threaded RTS had a fix for this a long time ago (#1623) but this
patch applies a similar fix to the non-threaded RTS.
MERGED from commit dd24d6bc37879c6b32a3d5ac4ee765e59e13501c
---
rts/posix/Select.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index a3f2ae301fcf..0b3f750a979c 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -217,10 +217,19 @@ awaitEvent(rtsBool wait)
ptv = NULL;
}
- /* Check for any interesting events */
-
- while ((numFound = select(maxfd+1, &rfd, &wfd, NULL, ptv)) < 0) {
- if (errno != EINTR) {
+ while (1) { // repeat the select on EINTR
+
+ // Disable the timer signal while blocked in
+ // select(), to conserve power. (#1623, #5991)
+ if (wait) stopTimer();
+
+ numFound = select(maxfd+1, &rfd, &wfd, NULL, ptv);
+
+ if (wait) startTimer();
+
+ if (numFound >= 0) break;
+
+ if (errno != EINTR) {
/* Handle bad file descriptors by unblocking all the
waiting threads. Why? Because a thread might have been
a bit naughty and closed a file descriptor while another
--
GitLab