From 7a5f8048fb4a9d620724a47d92762102089a6c9a Mon Sep 17 00:00:00 2001
From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 19 Jan 2012 09:33:52 +0000
Subject: [PATCH] Fix bug introduced in
fac8ecbbafde17dd92439c41747223c43e9d2b80
Fixes recent failures in hGetBuf001.
---
rts/posix/Select.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index ffe72e8933e4..013b374d1add 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -182,18 +182,18 @@ awaitEvent(rtsBool wait)
}
}
- if (wait) {
- ptv = NULL;
+ if (!wait) {
+ // just poll
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ ptv = &tv;
} else if (sleeping_queue != END_TSO_QUEUE) {
Time min = LowResTimeToTime(sleeping_queue->block_info.target - now);
tv.tv_sec = TimeToSeconds(min);
tv.tv_usec = TimeToUS(min) % 1000000;
ptv = &tv;
} else {
- // just poll
- tv.tv_sec = 0;
- tv.tv_usec = 0;
- ptv = &tv;
+ ptv = NULL;
}
/* Check for any interesting events */
--
GitLab