diff options
| author | Andreas Voellmy <andreas.voellmy@gmail.com> | 2012-12-20 01:21:24 -0500 |
|---|---|---|
| committer | Johan Tibell <johan.tibell@gmail.com> | 2013-02-11 21:38:04 -0800 |
| commit | 08e4e156268cdd2607dd17fc265f094c86f478aa (patch) | |
| tree | 48fa7ec7c918ef7ff8b78d38503ff5afb2c5ea47 /libraries/base/GHC/Event/Thread.hs | |
| parent | bd9498248343d1597a8201c3e60be89a6bc80ed6 (diff) | |
| download | haskell-08e4e156268cdd2607dd17fc265f094c86f478aa.tar.gz | |
Removed control registration flag from Manager and TimerManager new functions.
The timer manager always registers its control instance with the RTS hooks while the file io manager does not.
Diffstat (limited to 'libraries/base/GHC/Event/Thread.hs')
| -rw-r--r-- | libraries/base/GHC/Event/Thread.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/GHC/Event/Thread.hs b/libraries/base/GHC/Event/Thread.hs index 3613476917..4371815a6f 100644 --- a/libraries/base/GHC/Event/Thread.hs +++ b/libraries/base/GHC/Event/Thread.hs @@ -200,7 +200,7 @@ ensureIOManagerIsRunning startIOManagerThread :: IO () startIOManagerThread = modifyMVar_ ioManager $ \old -> do let create = do - !mgr <- new False + !mgr <- new writeIORef eventManager $ Just mgr !t <- forkIO $ loop mgr labelThread t "IOManager" @@ -232,7 +232,7 @@ startTimerManagerThread = modifyMVar_ timerManagerThreadVar $ \old -> do Nothing -> return () Just em -> M.shutdown em let create = do - !mgr <- TM.new True + !mgr <- TM.new writeIORef timerManager $ Just mgr !t <- forkIO $ TM.loop mgr `finally` shutdownEM labelThread t "TimerManager" |