git.iko.soy/distributed-process
on master help sign in
Implement matchChan
612bdd1Simon Marlow
distributed-process/src/Control/Distributed/Process.hs+2
@@ -39,6 +39,7 @@ module Control.Distributed.Process
39 , matchUnknown
39 , matchUnknown
40 , AbstractMessage(..)
40 , AbstractMessage(..)
41 , matchAny
41 , matchAny
42+ , matchChan
42 -- * Process management
43 -- * Process management
43 , spawn
44 , spawn
44 , call
45 , call
@@ -189,6 +190,7 @@ import Control.Distributed.Process.Internal.Primitives
189 , matchUnknown
190 , matchUnknown
190 , AbstractMessage(..)
191 , AbstractMessage(..)
191 , matchAny
192 , matchAny
193+ , matchChan
192 -- Process management
194 -- Process management
193 , terminate
195 , terminate
194 , ProcessTerminationException(..)
196 , ProcessTerminationException(..)
distributed-process/src/Control/Distributed/Process/Internal/CQueue.hs+173−64
@@ -1,8 +1,9 @@
1-- | Concurrent queue for single reader, single writer
1-- | Concurrent queue for single reader, single writer
2−{-# LANGUAGE MagicHash, UnboxedTuples #-}
2+{-# LANGUAGE MagicHash, UnboxedTuples, PatternGuards #-}
3module Control.Distributed.Process.Internal.CQueue
3module Control.Distributed.Process.Internal.CQueue
4 ( CQueue
4 ( CQueue
5 , BlockSpec(..)
5 , BlockSpec(..)
6+ , MatchOn(..)
6 , newCQueue
7 , newCQueue
7 , enqueue
8 , enqueue
8 , dequeue
9 , dequeue
@@ -12,14 +13,17 @@ module Control.Distributed.Process.Internal.CQueue
12import Prelude hiding (length, reverse)
13import Prelude hiding (length, reverse)
13import Control.Concurrent.STM
14import Control.Concurrent.STM
14 ( atomically
15 ( atomically
16+ , STM
15 , TChan
17 , TChan
18+ , tryReadTChan
16 , newTChan
19 , newTChan
17 , writeTChan
20 , writeTChan
18 , readTChan
21 , readTChan
19− , tryReadTChan
22+ , orElse
23+ , retry
20 )
24 )
21import Control.Applicative ((<$>), (<*>))
25import Control.Applicative ((<$>), (<*>))
22−import Control.Exception (mask, onException)
26+import Control.Exception (mask_, onException)
23import System.Timeout (timeout)
27import System.Timeout (timeout)
24import Control.Distributed.Process.Internal.StrictMVar
28import Control.Distributed.Process.Internal.StrictMVar
25 ( StrictMVar(StrictMVar)
29 ( StrictMVar(StrictMVar)
@@ -29,9 +33,9 @@ import Control.Distributed.Process.Internal.StrictMVar
29 )
33 )
30import Control.Distributed.Process.Internal.StrictList
34import Control.Distributed.Process.Internal.StrictList
31 ( StrictList(..)
35 ( StrictList(..)
32− , reverse
33− , reverse'
34 )
36 )
37+import qualified Control.Distributed.Process.Internal.StrictList as S
38+import Data.Maybe (fromJust)
35import GHC.MVar (MVar(MVar))
39import GHC.MVar (MVar(MVar))
36import GHC.IO (IO(IO))
40import GHC.IO (IO(IO))
37import GHC.Prim (mkWeak#)
41import GHC.Prim (mkWeak#)
@@ -55,71 +59,176 @@ data BlockSpec =
55 | Blocking
59 | Blocking
56 | Timeout Int
60 | Timeout Int
57
61
62+data MatchOn m a
63+ = MatchMsg (m -> Maybe a)
64+ | MatchChan (STM a)
65+
66+type MatchChunks m a = [Either [m -> Maybe a] [STM a]]
67+
68+chunkMatches :: [MatchOn m a] -> MatchChunks m a
69+chunkMatches [] = []
70+chunkMatches (MatchMsg m : ms) = Left (m : chk) : chunkMatches rest
71+ where (chk, rest) = spanMatchMsg ms
72+chunkMatches (MatchChan r : ms) = Right (r : chk) : chunkMatches rest
73+ where (chk, rest) = spanMatchChan ms
74+
75+spanMatchMsg :: [MatchOn m a] -> ([m -> Maybe a], [MatchOn m a])
76+spanMatchMsg [] = ([],[])
77+spanMatchMsg (m : ms)
78+ | MatchMsg msg <- m = (msg:msgs, rest)
79+ | otherwise = ([], m:ms)
80+ where !(msgs,rest) = spanMatchMsg ms
81+
82+spanMatchChan :: [MatchOn m a] -> ([STM a], [MatchOn m a])
83+spanMatchChan [] = ([],[])
84+spanMatchChan (m : ms)
85+ | MatchChan stm <- m = (stm:stms, rest)
86+ | otherwise = ([], m:ms)
87+ where !(stms,rest) = spanMatchChan ms
88+
58-- | Dequeue an element
89-- | Dequeue an element
59--
90--
60-- The timeout (if any) is applied only to waiting for incoming messages, not
91-- The timeout (if any) is applied only to waiting for incoming messages, not
61-- to checking messages that have already arrived
92-- to checking messages that have already arrived
62−dequeue :: forall a b.
93+dequeue :: forall m a.
63− CQueue a -- ^ Queue
94+ CQueue m -- ^ Queue
64 -> BlockSpec -- ^ Blocking behaviour
95 -> BlockSpec -- ^ Blocking behaviour
65− -> [a -> Maybe b] -- ^ List of matches
96+ -> [MatchOn m a] -- ^ List of matches
66− -> IO (Maybe b) -- ^ 'Nothing' only on timeout
97+ -> IO (Maybe a) -- ^ 'Nothing' only on timeout
67−dequeue (CQueue arrived incoming) blockSpec matches = go
98+dequeue (CQueue arrived incoming) blockSpec matchons =
99+ case blockSpec of
100+ Timeout n -> timeout n $ fmap fromJust go
101+ _other ->
102+ case chunks of
103+ [Right ports] -> -- channels only, this is easy:
104+ case blockSpec of
105+ NonBlocking -> atomically $ waitChans ports (return Nothing)
106+ _ -> atomically $ waitChans ports retry
107+ -- no onException needed
108+ _other -> go
68 where
109 where
69− go :: IO (Maybe b)
110+ chunks = chunkMatches matchons
70− go = mask $ \restore -> do
111+
112+ go = mask_ $ do
71− arr <- takeMVar arrived
113+ arr <- takeMVar arrived
72− -- We first check the arrived messages. If we get interrupted during this
114+ let grabNew xs = do
73− -- search, we just put the MVar back (we haven't read from the Chan yet)
115+ r <- atomically $ tryReadTChan incoming
74− (arr', mb) <- onException (restore (checkArrived Nil arr))
116+ case r of
75− (putMVar arrived arr)
117+ Nothing -> return xs
118+ Just x -> grabNew (Snoc xs x)
119+ arr' <- grabNew arr
120+ goCheck chunks arr'
121+
122+ waitChans ports on_block =
123+ foldr orElse on_block (map (fmap Just) ports)
124+
125+ --
126+ -- First check the MatchChunks against the messages already in the
127+ -- mailbox. For channel matches, we do a non-blocking check at
128+ -- this point.
129+ --
130+ goCheck :: MatchChunks m a
131+ -> StrictList m -- messages to check, in this order
132+ -> IO (Maybe a)
133+
134+ goCheck [] old = goWait old
135+
136+ goCheck (Right ports : rest) old = do
137+ r <- atomically $ waitChans ports (return Nothing) -- does not block
138+ case r of
139+ Just _ -> returnOld old r
140+ Nothing -> goCheck rest old
141+
142+ goCheck (Left matches : rest) old = do
143+ -- checkArrived might in principle take arbitrary time, so
144+ -- we ought to call restore and use an exception handler. However,
145+ -- the check is usually fast (just a comparison), and the overhead
146+ -- of passing around restore and setting up exception handlers is
147+ -- high. So just don't use expensive matchIfs!
148+ case checkArrived matches old of
149+ (old', Just r) -> returnOld old' (Just r)
150+ (old', Nothing) -> goCheck rest old'
151+ -- use the result list, which is now left-biased
152+
153+ --
154+ -- Construct an STM transaction that looks at the relevant channels
155+ -- in the correct order.
156+ --
157+ mkSTM :: MatchChunks m a -> STM (Either m a)
158+ mkSTM [] = retry
159+ mkSTM (Left _ : rest)
160+ = fmap Left (readTChan incoming) `orElse` mkSTM rest
161+ mkSTM (Right ports : rest)
162+ = foldr orElse (mkSTM rest) (map (fmap Right) ports)
163+
164+ waitIncoming :: IO (Maybe (Either m a))
76− case (mb, blockSpec) of
165+ waitIncoming = case blockSpec of
77− (Just b, _) -> do
166+ NonBlocking -> atomically $ fmap Just stm `orElse` return Nothing
78− putMVar arrived arr'
167+ _ -> atomically $ fmap Just stm
79− return (Just b)
168+ where
80− (Nothing, NonBlocking) ->
169+ stm = mkSTM chunks
81− checkNonBlocking arr'
170+
82− (Nothing, Blocking) ->
171+ --
83− Just <$> checkBlocking arr'
172+ -- The initial pass didn't find a message, so now we go into blocking
84− (Nothing, Timeout n) ->
173+ -- mode.
85− timeout n $ checkBlocking arr'
174+ --
86−
175+ -- Contents of 'arrived' from now on is (old ++ new), and
87− -- We reverse the accumulator on return only if we find a match
176+ -- messages that arrive are snocced onto new.
88− checkArrived :: StrictList a -> StrictList a -> IO (StrictList a, Maybe b)
177+ --
89− checkArrived acc Nil = return (acc, Nothing)
178+ goWait old = do
90− checkArrived acc (Cons x xs) =
179+ r <- waitIncoming `onException` putMVar arrived old
180+ case r of
181+ -- Nothing => non-blocking and no message
182+ Nothing -> returnOld old Nothing
183+ Just e -> case e of
184+ --
185+ -- Left => message arrived in the process mailbox. We now have to
186+ -- run through the MatchChunks checking each one, because we might
187+ -- have a situation where the first chunk fails to match and the
188+ -- second chunk is a channel match and there *is* a message in the
189+ -- channel. In that case the channel wins.
190+ --
191+ Left m -> goCheck1 chunks m old
192+ --
193+ -- Right => message arrived on a channel first
194+ --
195+ Right a -> returnOld old (Just a)
196+
197+ --
198+ -- A message arrived in the process inbox; check the MatchChunks for
199+ -- a valid match.
200+ --
201+ goCheck1 :: MatchChunks m a
202+ -> m -- single message to check
203+ -> StrictList m -- old messages we have already checked
204+ -> IO (Maybe a)
205+
206+ goCheck1 [] m old = goWait (Snoc old m)
207+
208+ goCheck1 (Right ports : rest) m old = do
209+ r <- atomically $ waitChans ports (return Nothing) -- does not block
91− case check x of
210+ case r of
92− Just y -> return (reverse' acc xs, Just y)
211+ Nothing -> goCheck1 rest m old
93− Nothing -> checkArrived (Cons x acc) xs
212+ Just _ -> returnOld (Snoc old m) r
94−
213+
95− -- If we call checkBlocking there may or may not be a timeout
214+ goCheck1 (Left matches : rest) m old = do
96− checkBlocking :: StrictList a -> IO b
215+ case checkMatches matches m of
97− checkBlocking acc = do
216+ Nothing -> goCheck1 rest m old
98− -- readTChan is a blocking call, and hence is interruptable. If it is
217+ Just p -> returnOld old (Just p)
99− -- interrupted, we put the value of the accumulator in 'arrived'
218+
100− -- (as opposed to the original value), so that no messages get lost
219+ -- a common pattern for putting back the arrived queue at the end
101− -- (hence the low-level structure using mask rather than modifyMVar)
220+ returnOld :: StrictList m -> Maybe a -> IO (Maybe a)
102− x <- onException (atomically $ readTChan incoming)
221+ returnOld old r = do putMVar arrived old; return r
103− (putMVar arrived $ reverse acc)
222+
104− case check x of
223+ -- as a side-effect, this left-biases the list
105− Nothing -> checkBlocking (Cons x acc)
224+ checkArrived :: [m -> Maybe a] -> StrictList m -> (StrictList m, Maybe a)
106− Just y -> putMVar arrived (reverse acc) >> return y
225+ checkArrived matches list = S.foldr f (Nil, Nothing) list
107−
226+ where
108− -- checkNonBlocking is only called if there is no timeout
227+ f x (rest,r)
109− checkNonBlocking :: StrictList a -> IO (Maybe b)
228+ | Just y <- checkMatches matches x = (rest, Just y)
110− checkNonBlocking acc = do
229+ | otherwise = (Cons x rest, r)
111− -- tryReadTChan is *not* interruptible
230+
112− mx <- atomically $ tryReadTChan incoming
113− case mx of
114− Nothing -> putMVar arrived (reverse acc) >> return Nothing
115− Just x -> case check x of
116− Nothing -> checkNonBlocking (Cons x acc)
117− Just y -> putMVar arrived (reverse acc) >> return (Just y)
118−
119− check :: a -> Maybe b
120− check = checkMatches matches
121−
122− checkMatches :: [a -> Maybe b] -> a -> Maybe b
231+ checkMatches :: [m -> Maybe a] -> m -> Maybe a
123 checkMatches [] _ = Nothing
232 checkMatches [] _ = Nothing
124 checkMatches (m:ms) a = case m a of Nothing -> checkMatches ms a
233 checkMatches (m:ms) a = case m a of Nothing -> checkMatches ms a
125 Just b -> Just b
234 Just b -> Just b
distributed-process/src/Control/Distributed/Process/Internal/Primitives.hs+13−5
@@ -21,6 +21,7 @@ module Control.Distributed.Process.Internal.Primitives
21 , matchUnknown
21 , matchUnknown
22 , AbstractMessage(..)
22 , AbstractMessage(..)
23 , matchAny
23 , matchAny
24+ , matchChan
24 -- * Process management
25 -- * Process management
25 , terminate
26 , terminate
26 , ProcessTerminationException(..)
27 , ProcessTerminationException(..)
@@ -106,7 +107,11 @@ import Control.Concurrent.STM
106 , readTVar
107 , readTVar
107 , writeTVar
108 , writeTVar
108 )
109 )
109−import Control.Distributed.Process.Internal.CQueue (dequeue, BlockSpec(..))
110+import Control.Distributed.Process.Internal.CQueue
111+ ( dequeue
112+ , BlockSpec(..)
113+ , MatchOn(..)
114+ )
110import Control.Distributed.Process.Serializable (Serializable, fingerprint)
115import Control.Distributed.Process.Serializable (Serializable, fingerprint)
111import Data.Accessor ((^.), (^:), (^=))
116import Data.Accessor ((^.), (^:), (^=))
112import Control.Distributed.Static (Closure, Static)
117import Control.Distributed.Static (Closure, Static)
@@ -258,7 +263,7 @@ mergePortsRR = \ps -> do
258--------------------------------------------------------------------------------
263--------------------------------------------------------------------------------
259
264
260-- | Opaque type used in 'receiveWait' and 'receiveTimeout'
265-- | Opaque type used in 'receiveWait' and 'receiveTimeout'
261−newtype Match b = Match { unMatch :: Message -> Maybe (Process b) }
266+newtype Match b = Match { unMatch :: MatchOn Message (Process b) }
262
267
263-- | Test the matches in order against each message in the queue
268-- | Test the matches in order against each message in the queue
264receiveWait :: [Match b] -> Process b
269receiveWait :: [Match b] -> Process b
@@ -281,13 +286,16 @@ receiveTimeout t ms = do
281 Nothing -> return Nothing
286 Nothing -> return Nothing
282 Just proc -> Just <$> proc
287 Just proc -> Just <$> proc
283
288
289+matchChan :: ReceivePort a -> (a -> Process b) -> Match b
290+matchChan p fn = Match $ MatchChan (fmap fn (receiveSTM p))
291+
284-- | Match against any message of the right type
292-- | Match against any message of the right type
285match :: forall a b. Serializable a => (a -> Process b) -> Match b
293match :: forall a b. Serializable a => (a -> Process b) -> Match b
286match = matchIf (const True)
294match = matchIf (const True)
287
295
288-- | Match against any message of the right type that satisfies a predicate
296-- | Match against any message of the right type that satisfies a predicate
289matchIf :: forall a b. Serializable a => (a -> Bool) -> (a -> Process b) -> Match b
297matchIf :: forall a b. Serializable a => (a -> Bool) -> (a -> Process b) -> Match b
290−matchIf c p = Match $ \msg ->
298+matchIf c p = Match $ MatchMsg $ \msg ->
291 case messageFingerprint msg == fingerprint (undefined :: a) of
299 case messageFingerprint msg == fingerprint (undefined :: a) of
292 True | c decoded -> Just (p decoded)
300 True | c decoded -> Just (p decoded)
293 where
301 where
@@ -304,7 +312,7 @@ data AbstractMessage = AbstractMessage {
304
312
305-- | Match against an arbitrary message
313-- | Match against an arbitrary message
306matchAny :: forall b. (AbstractMessage -> Process b) -> Match b
314matchAny :: forall b. (AbstractMessage -> Process b) -> Match b
307−matchAny p = Match $ Just . p . abstract
315+matchAny p = Match $ MatchMsg $ Just . p . abstract
308 where
316 where
309 abstract :: Message -> AbstractMessage
317 abstract :: Message -> AbstractMessage
310 abstract msg = AbstractMessage {
318 abstract msg = AbstractMessage {
@@ -319,7 +327,7 @@ matchAny p = Match $ Just . p . abstract
319
327
320-- | Remove any message from the queue
328-- | Remove any message from the queue
321matchUnknown :: Process b -> Match b
329matchUnknown :: Process b -> Match b
322−matchUnknown = Match . const . Just
330+matchUnknown p = Match $ MatchMsg (const (Just p))
323
331
324--------------------------------------------------------------------------------
332--------------------------------------------------------------------------------
325-- Process management --
333-- Process management --
distributed-process/src/Control/Distributed/Process/Internal/StrictList.hs+19−17
@@ -1,25 +1,27 @@
1-- | Spine and element strict list
1-- | Spine and element strict list
2module Control.Distributed.Process.Internal.StrictList
2module Control.Distributed.Process.Internal.StrictList
3− ( StrictList(Cons, Nil)
3+ ( StrictList(..)
4− , length
4+ , append
5− , reverse
5+ , foldr
6− , reverse'
7 ) where
6 ) where
8
7
9−import Prelude hiding (length, reverse)
8+import Prelude hiding (length, reverse, foldr)
10
9
11-- | Strict list
10-- | Strict list
11+data StrictList a
12−data StrictList a = Cons !a !(StrictList a) | Nil
12+ = Cons !a !(StrictList a)
13+ | Nil
14+ | Snoc !(StrictList a) !a
15+ | Append !(StrictList a) !(StrictList a)
13
16
14−length :: StrictList a -> Int
17+append :: StrictList a -> StrictList a -> StrictList a
15−length Nil = 0
18+append Nil l = l
16−length (Cons _ xs) = 1 + length xs
19+append l Nil = l
20+append l1 l2 = l1 `Append` l2
17
21
18−-- | Reverse a strict list
19−reverse :: StrictList a -> StrictList a
22+foldr :: (a -> b -> b) -> b -> StrictList a -> b
20−reverse xs = reverse' xs Nil
23+foldr f c0 xs0 = go xs0 c0
21−
24+ where go Nil c = c
22−-- | @reverseStrict' xs ys@ is 'reverse xs ++ ys' if they were lists
25+ go (Cons x xs) c = f x (go xs c)
23−reverse' :: StrictList a -> StrictList a -> StrictList a
26+ go (Snoc xs x) c = go xs (f x c)
24−reverse' Nil ys = ys
27+ go (Append xs ys) c = go xs (go ys c)
25−reverse' (Cons x xs) ys = reverse' xs (Cons x ys)