Skip to content

Commit

Permalink
Get rid of some easily nuked warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
bos committed May 12, 2010
1 parent fb36be6 commit fb29ef4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions src/System/Event/Array.hs
Expand Up @@ -24,8 +24,7 @@ module System.Event.Array
) where ) where


import Control.Monad (when) import Control.Monad (when)
import Data.IORef (IORef, atomicModifyIORef, mkWeakIORef, newIORef, readIORef, import Data.IORef (IORef, atomicModifyIORef, newIORef, readIORef, writeIORef)
writeIORef)
import Foreign.C.Types (CSize) import Foreign.C.Types (CSize)
import Foreign.ForeignPtr (ForeignPtr, withForeignPtr) import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
import Foreign.Ptr (Ptr, nullPtr, plusPtr) import Foreign.Ptr (Ptr, nullPtr, plusPtr)
Expand Down
14 changes: 7 additions & 7 deletions src/System/Event/Manager.hs
Expand Up @@ -187,14 +187,14 @@ newWith be = do
when (st /= Finished) $ do when (st /= Finished) $ do
I.delete be I.delete be
closeControl ctrl closeControl ctrl
finished <- newEmptyMVar fini <- newEmptyMVar
let mgr = EventManager { emBackend = be let mgr = EventManager { emBackend = be
, emFds = iofds , emFds = iofds
, emTimeouts = timeouts , emTimeouts = timeouts
, emState = state , emState = state
, emUniqueSource = us , emUniqueSource = us
, emControl = ctrl , emControl = ctrl
, emFinished = finished , emFinished = fini
} }
_ <- registerFd_ mgr (handleControlEvent mgr) (controlReadFd ctrl) evtRead _ <- registerFd_ mgr (handleControlEvent mgr) (controlReadFd ctrl) evtRead
_ <- registerFd_ mgr (handleControlEvent mgr) (wakeupReadFd ctrl) evtRead _ <- registerFd_ mgr (handleControlEvent mgr) (wakeupReadFd ctrl) evtRead
Expand All @@ -211,7 +211,7 @@ finished :: EventManager -> IO Bool
finished mgr = (== Finished) `liftM` readIORef (emState mgr) finished mgr = (== Finished) `liftM` readIORef (emState mgr)


cleanup :: EventManager -> IO () cleanup :: EventManager -> IO ()
cleanup mgr@EventManager{..} = do cleanup EventManager{..} = do
writeIORef emState Finished writeIORef emState Finished
I.delete emBackend I.delete emBackend
closeControl emControl closeControl emControl
Expand All @@ -233,16 +233,16 @@ loop mgr@EventManager{..} = do
when running $ go q' when running $ go q'


init :: EventManager -> IO () init :: EventManager -> IO ()
init mgr@EventManager{..} = do init EventManager{..} = do
state <- atomicModifyIORef emState $ \s -> case s of state <- atomicModifyIORef emState $ \s -> case s of
Created -> (Running, s) Created -> (Running, s)
_ -> (s, s) _ -> (s, s)
when (state /= Created) . when (state /= Created) .
error $ "System.Event.Manager.init: state is already " ++ show state error $ "System.Event.Manager.init: state is already " ++ show state


step :: EventManager -> TimeoutQueue -> IO (Bool, TimeoutQueue) step :: EventManager -> TimeoutQueue -> IO (Bool, TimeoutQueue)
step mgr@EventManager{..} q = do step mgr@EventManager{..} tq = do
(timeout, q') <- mkTimeout q (timeout, q') <- mkTimeout tq
I.poll emBackend timeout (onFdEvent mgr) I.poll emBackend timeout (onFdEvent mgr)
state <- readIORef emState state <- readIORef emState
state `seq` return (state == Running, q') state `seq` return (state == Running, q')
Expand All @@ -253,7 +253,7 @@ step mgr@EventManager{..} q = do
mkTimeout :: TimeoutQueue -> IO (Timeout, TimeoutQueue) mkTimeout :: TimeoutQueue -> IO (Timeout, TimeoutQueue)
mkTimeout q = do mkTimeout q = do
now <- getCurrentTime now <- getCurrentTime
newTimeouts <- atomicModifyIORef emTimeouts $ \q -> ([], q) newTimeouts <- atomicModifyIORef emTimeouts $ \q' -> ([], q')
let (expired, q') = Q.atMost now (applyTimeoutEdits q newTimeouts) let (expired, q') = Q.atMost now (applyTimeoutEdits q newTimeouts)
sequence_ $ map Q.value expired sequence_ $ map Q.value expired
let timeout = case Q.minView q' of let timeout = case Q.minView q' of
Expand Down
2 changes: 1 addition & 1 deletion src/System/Event/Signal.hsc
Expand Up @@ -70,7 +70,7 @@ blockAllSignals = do
sigProcMask sigSetMask blocked nullPtr sigProcMask sigSetMask blocked nullPtr


loop :: SignalManager -> IO () loop :: SignalManager -> IO ()
loop mgr@SignalManager{..} = loop SignalManager{..} =
runInBoundThread $ do runInBoundThread $ do
withForeignPtr smThread c_thread_self withForeignPtr smThread c_thread_self
alloca $ alloca . go alloca $ alloca . go
Expand Down

0 comments on commit fb29ef4

Please sign in to comment.