summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
authorGravatar Ben Gamari <bgamari.foss@gmail.com>2012-10-05 17:04:46 -0400
committerGravatar Ben Gamari <bgamari.foss@gmail.com>2012-10-05 17:04:46 -0400
commit5d64a3652fca4321d71870862abdb106e5b140c2 (patch)
treeeb341ac108ae1c97c008242fe445fed1869e7f98 /Utility
parent9722f498c21498f88225e0b5d53229221a99e87d (diff)
NotificationBroadcaster: Use SampleVars from SafeSemaphores instead of base
SampleVars from base are unsafe
Diffstat (limited to 'Utility')
-rw-r--r--Utility/NotificationBroadcaster.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Utility/NotificationBroadcaster.hs b/Utility/NotificationBroadcaster.hs
index accc35fe1..4bbbc544a 100644
--- a/Utility/NotificationBroadcaster.hs
+++ b/Utility/NotificationBroadcaster.hs
@@ -26,10 +26,10 @@ module Utility.NotificationBroadcaster (
import Common
import Control.Concurrent.STM
-import Control.Concurrent.SampleVar
+import Control.Concurrent.MSampleVar
-{- One SampleVar per client. The TMVar is never empty, so never blocks. -}
-type NotificationBroadcaster = TMVar [SampleVar ()]
+{- One MSampleVar per client. The TMVar is never empty, so never blocks. -}
+type NotificationBroadcaster = TMVar [MSampleVar ()]
newtype NotificationId = NotificationId Int
deriving (Read, Show, Eq, Ord)
@@ -47,7 +47,7 @@ newNotificationHandle b = NotificationHandle
<*> addclient
where
addclient = do
- s <- newEmptySampleVar
+ s <- newEmptySV
atomically $ do
l <- takeTMVar b
putTMVar b $ l ++ [s]
@@ -67,11 +67,11 @@ sendNotification b = do
l <- atomically $ readTMVar b
mapM_ notify l
where
- notify s = writeSampleVar s ()
+ notify s = writeSV s ()
{- Used by a client to block until a new notification is available since
- the last time it tried. -}
waitNotification :: NotificationHandle -> IO ()
waitNotification (NotificationHandle b (NotificationId i)) = do
l <- atomically $ readTMVar b
- readSampleVar (l !! i)
+ readSV (l !! i)