summaryrefslogtreecommitdiff
path: root/rts/RtsStartup.c
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2014-05-23 23:58:06 +0300
committerSimon Marlow <marlowsd@gmail.com>2014-06-08 11:21:11 +0100
commit9fd507e5758f4141ac2619f0db57136bcab035c6 (patch)
tree2eb2d698e7d0b634804dd1753400395f352eb00e /rts/RtsStartup.c
parent2f8b4c9330b455d4cb31c186c747a7db12a69251 (diff)
downloadhaskell-9fd507e5758f4141ac2619f0db57136bcab035c6.tar.gz
Raise exceptions when blocked in bad FDs (fixes Trac #4934)
Before the patch any call to 'select()' with 'bad_fd' led to: - unblocking of all threads - hiding exception for 'threadWaitRead bad_fd' The patch fixes both cases in this way: after 'select()' failure we iterate over each blocked descriptor and poll individually to see it's actual status, which is: - READY (move to run queue) - BLOCKED (leave in blocked queue) - INVALID (send an IOErrror exception) Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'rts/RtsStartup.c')
-rw-r--r--rts/RtsStartup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 06e888c1b2..c9f5880774 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -209,6 +209,7 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config)
getStablePtr((StgPtr)nonTermination_closure);
getStablePtr((StgPtr)blockedIndefinitelyOnSTM_closure);
getStablePtr((StgPtr)nestedAtomically_closure);
+ getStablePtr((StgPtr)blockedOnBadFD_closure);
getStablePtr((StgPtr)runSparks_closure);
getStablePtr((StgPtr)ensureIOManagerIsRunning_closure);