diff options
author | Merijn Verstraaten <merijn@inconsistent.nl> | 2014-11-07 07:32:18 -0600 |
---|---|---|
committer | Austin Seipp <austin@well-typed.com> | 2014-11-07 07:32:19 -0600 |
commit | 24e05f48f3a3a1130ecd5a46e3089b76ee5a2304 (patch) | |
tree | 0a74d2046aa7cdfdd859b683815a30e7a9a345dd /rts | |
parent | b0e8e34ac1b4dcab2e4ec92d00440e047d260562 (diff) | |
download | haskell-24e05f48f3a3a1130ecd5a46e3089b76ee5a2304.tar.gz |
*Really*, really fix RTS crash due to bad coercion.
Summary:
My previous attempt to fix the new coercion bug introduced by my fix actually
just reverted back to the *old* bug. This time it should properly handle all
three size scenarios.
Signed-off-by: Merijn Verstraaten <merijn@inconsistent.nl>
Test Plan: validate
Reviewers: dfeuer, austin, hvr
Reviewed By: austin, hvr
Subscribers: thomie, carter, simonmar
Differential Revision: https://phabricator.haskell.org/D407
GHC Trac Issues: #8089
Diffstat (limited to 'rts')
-rw-r--r-- | rts/posix/Select.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/rts/posix/Select.c b/rts/posix/Select.c index 38b0821036..4b1923504b 100644 --- a/rts/posix/Select.c +++ b/rts/posix/Select.c @@ -295,9 +295,32 @@ awaitEvent(rtsBool wait) tv.tv_usec = 0; ptv = &tv; } else if (sleeping_queue != END_TSO_QUEUE) { + /* SUSv2 allows implementations to have an implementation defined + * maximum timeout for select(2). The standard requires + * implementations to silently truncate values exceeding this maximum + * to the maximum. Unfortunately, OSX and the BSD don't comply with + * SUSv2, instead opting to return EINVAL for values exceeding a + * timeout of 1e8. + * + * Select returning an error crashes the runtime in a bad way. To + * play it safe we truncate any timeout to 31 days, as SUSv2 requires + * any implementations maximum timeout to be larger than this. + * + * Truncating the timeout is not an issue, because if nothing + * interesting happens when the timeout expires, we'll see that the + * thread still wants to be blocked longer and simply block on a new + * iteration of select(2). + */ + const time_t max_seconds = 2678400; // 31 * 24 * 60 * 60 + Time min = LowResTimeToTime(sleeping_queue->block_info.target - now); tv.tv_sec = TimeToSeconds(min); - tv.tv_usec = TimeToUS(min) % 1000000; + if (tv.tv_sec < max_seconds) { + tv.tv_usec = TimeToUS(min) % 1000000; + } else { + tv.tv_sec = max_seconds; + tv.tv_usec = 0; + } ptv = &tv; } else { ptv = NULL; |