[commit: packages/base] master: Fix hangs with -threaded on iOS (#8307) (ff8200a)
git at git.haskell.org
git
Sat Oct 12 05:56:13 UTC 2013
Repository : ssh://git at git.haskell.org/base
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/ff8200afda9b7ada28e1199a109b6b5acf8c30d6/base
>---------------------------------------------------------------
commit ff8200afda9b7ada28e1199a109b6b5acf8c30d6
Author: Austin Seipp <aseipp at pobox.com>
Date: Fri Oct 11 22:11:53 2013 -0500
Fix hangs with -threaded on iOS (#8307)
Authored-by: Luke Iannini <lukexi at me.com>
Signed-off-by: Austin Seipp <aseipp at pobox.com>
>---------------------------------------------------------------
ff8200afda9b7ada28e1199a109b6b5acf8c30d6
GHC/Event/Manager.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/GHC/Event/Manager.hs b/GHC/Event/Manager.hs
index 5c87d0c..14f7098 100644
--- a/GHC/Event/Manager.hs
+++ b/GHC/Event/Manager.hs
@@ -135,7 +135,7 @@ callbackTableVar mgr fd = emFds mgr ! hashFd fd
haveOneShot :: Bool
{-# INLINE haveOneShot #-}
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) || defined(ios_HOST_OS)
haveOneShot = False
#elif defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
haveOneShot = True
@@ -353,7 +353,7 @@ registerFd mgr cb fd evs = do
-}
-- | Wake up the event manager.
wakeManager :: EventManager -> IO ()
-#if defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS) || defined(ios_HOST_OS)
wakeManager mgr = sendWakeup (emControl mgr)
#elif defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
wakeManager _ = return ()
More information about the ghc-commits
mailing list