@@ -1,23 +1,12 @@
1−{-# LANGUAGE DeriveGeneric #-}
2−{-# LANGUAGE ParallelListComp #-}
3−
1+{-# LANGUAGE DeriveGeneric #-}
42module Control.Distributed.Process.Tests.Mx (tests) where
53
64import Control.Distributed.Process.Tests.Internal.Utils
75import Network.Transport.Test (TestTransport(..))
8−import Control.Distributed.Process hiding (bracket, finally, try)
9−import Control.Distributed.Process.Internal.Types
10− ( ProcessExitException(..)
11− , unsafeCreateUnencodedMessage
12− )
6+
7+import Control.Concurrent (threadDelay)
8+import Control.Distributed.Process
139import Control.Distributed.Process.Node
14−import qualified Control.Distributed.Process.UnsafePrimitives as Unsafe
15− ( send
16− , nsend
17− , nsendRemote
18− , usend
19− , sendChan
20− )
2110import Control.Distributed.Process.Management
2211 ( MxEvent(..)
2312 , MxAgentId(..)
@@ -32,15 +21,15 @@ import Control.Distributed.Process.Management
3221 , mxUpdateLocal
3322 , mxNotify
3423 , mxBroadcast
24+ , mxGetId
3525 )
3626import Control.Monad (void, unless)
37−import Control.Monad.Catch(finally, bracket, try)
3827import Control.Rematch (equalTo)
3928import Data.Binary
40−import Data.List (find, sort, intercalate)
41−import Data.Maybe (isJust, fromJust, isNothing, fromMaybe, catMaybes)
29+import Data.List (find, sort)
30+import Data.Maybe (isJust, isNothing)
4231import Data.Typeable
43−import GHC.Generics hiding (from)
32+import GHC.Generics
4433#if ! MIN_VERSION_base(4,6,0)
4534import Prelude hiding (catch, log)
4635#endif
@@ -64,9 +53,9 @@ awaitExit pid =
6453 (\_ -> return ())
6554 ]
6655 where
67− withMonitorRef p = bracket (monitor p) unmonitor
56+ withMonitorRef pid = bracket (monitor pid) unmonitor
6857
69−testAgentBroadcast :: TestResult (Maybe ()) -> Process ()
58+testAgentBroadcast :: TestResult () -> Process ()
7059testAgentBroadcast result = do
7160 (resultSP, resultRP) <- newChan :: Process (SendPort (), ReceivePort ())
7261
@@ -81,10 +70,10 @@ testAgentBroadcast result = do
8170 mxNotify ()
8271 -- Once the publisher has seen our message, it will broadcast the Publish
8372 -- and the consumer will see that and send the result to our typed channel.
84− stash result =<< receiveChanTimeout 10000000 resultRP
73+ stash result =<< receiveChan resultRP
8574
86− kill publisher "finished"
87− kill consumer "finished"
75+ kill publisher "finished" >> awaitExit publisher
76+ kill consumer "finished" >> awaitExit consumer
8877
8978testAgentDualInput :: TestResult (Maybe Int) -> Process ()
9079testAgentDualInput result = do
@@ -99,8 +88,6 @@ testAgentDualInput result = do
9988 else mxReady)
10089 ]
10190
102− mRef <- monitor s
103−
10491 mxNotify (1 :: Int)
10592 nsend "sum-agent" (3 :: Int)
10693 mxNotify (2 :: Int)
@@ -108,10 +95,7 @@ testAgentDualInput result = do
10895 mxNotify (5 :: Int)
10996
11097 stash result =<< receiveChanTimeout 10000000 rp
111− died <- receiveTimeout 10000000 [
112− matchIf (\(ProcessMonitorNotification r _ _) -> r == mRef) (const $ return True)
113− ]
114− died `shouldBe` equalTo (Just True)
98+ awaitExit s
11599
116100testAgentPrioritisation :: TestResult [String] -> Process ()
117101testAgentPrioritisation result = do
@@ -125,10 +109,10 @@ testAgentPrioritisation result = do
125109 (sp, rp) <- newChan
126110 s <- mxAgent (MxAgentId name) ["first"] [
127111 mxSink (\(s :: String) -> do
128− mxUpdateLocal (s:)
112+ mxUpdateLocal ((s:))
129113 st <- mxGetLocal
130114 case length st of
131− n | n == 5 -> do liftMX $ sendChan sp (sort st)
115+ n | n == 5 -> do liftMX $ sendChan sp st
132116 mxDeactivate "finished"
133117 _ -> mxReceive -- go to the mailbox
134118 )
@@ -139,7 +123,7 @@ testAgentPrioritisation result = do
139123 mxNotify "fourth"
140124 nsend name "fifth"
141125
142− stash result . fromMaybe [] =<< receiveChanTimeout 10000000 rp
126+ stash result . sort =<< receiveChan rp
143127 awaitExit s
144128
145129testAgentMailboxHandling :: TestResult (Maybe ()) -> Process ()
@@ -152,19 +136,12 @@ testAgentMailboxHandling result = do
152136 nsend "mailbox-agent" ()
153137
154138 stash result =<< receiveChanTimeout 1000000 rp
155− kill agent "finished"
139+ kill agent "finished" >> awaitExit agent
156140
157141testAgentEventHandling :: TestResult Bool -> Process ()
158142testAgentEventHandling result = do
159− us <- getSelfPid
160− -- because this test is a bit racy, let's ensure it can't run indefinitely
161− timer <- spawnLocal $ do
162− pause (1000000 * 60 * 5)
163− -- okay we've waited 5 mins, let's kill the test off if it's stuck...
164− stash result False
165− kill us "Test Timed Out"
166−
167143 let initState = [] :: [MxEvent]
144+
168145 (rc, rs) <- newChan
169146 agentPid <- mxAgent (MxAgentId "lifecycle-listener-agent") initState [
170147 (mxSink $ \ev -> do
@@ -197,7 +174,8 @@ testAgentEventHandling result = do
197174 -- TODO: yes, this is racy, but we're at the mercy of the scheduler here...
198175 faff 2000000 rs
199176
200− (sp, rp) <- newChan :: Process (SendPort (), ReceivePort ())
177+ _ <- monitor agentPid
178+ (sp, rp) <- newChan
201179
202180 pid <- spawnLocal $ expect >>= sendChan sp
203181
@@ -206,11 +184,9 @@ testAgentEventHandling result = do
206184 monitor pid
207185
208186 send pid ()
209− rct <- receiveChanTimeout 10000000 rp
210− unless (isJust rct) $ die "No response on channel"
187+ () <- receiveChan rp
211188
212− pmn <- receiveTimeout 2000000 [ match (\ProcessMonitorNotification{} -> return ()) ]
213− unless (isJust pmn) $ die "No monitor notification arrived"
189+ receiveWait [ match (\(ProcessMonitorNotification _ _ _) -> return ()) ]
214190
215191 -- TODO: yes, this is racy, but we're at the mercy of the scheduler here...
216192 faff 2000000 rs
@@ -219,16 +195,17 @@ testAgentEventHandling result = do
219195 mxNotify (MxSpawned pid, replyTo)
220196 mxNotify (MxProcessDied pid DiedNormal, replyTo)
221197
222− seenAlive <- receiveChanTimeout 10000000 reply
223− seenDead <- receiveChanTimeout 10000000 reply
198+ seenAlive <- receiveChan reply
199+ seenDead <- receiveChan reply
224200
225− stash result $ foldr (&&) True $ catMaybes [seenAlive, seenDead]
226− kill timer "test-complete"
227− kill agentPid "test-complete"
201+ stash result $ seenAlive && seenDead
202+ kill agentPid "test-complete" >> awaitExit agentPid
228203 where
229204 faff delay port = do
230205 res <- receiveChanTimeout delay port
231− unless (isNothing res) $ pause delay
206+ unless (isNothing res) $ do
207+ pause delay
208+ faff delay port
232209
233210testMxRegEvents :: TestResult () -> Process ()
234211testMxRegEvents result = do
@@ -275,6 +252,7 @@ testMxRegEvents result = do
275252 reg3 `shouldBe` equalTo (Just (label, p1))
276253
277254 mapM_ (flip kill $ "test-complete") [agent, p1, p2]
255+ awaitExit agent
278256
279257testMxRegMon :: LocalNode -> TestResult () -> Process ()
280258testMxRegMon remoteNode result = do
@@ -332,211 +310,48 @@ testMxRegMon remoteNode result = do
332310 evts `shouldContain` (Just (label1, p1))
333311 evts `shouldContain` (Just (label2, p1))
334312
335− kill agent "test-complete"
313+ kill agent "test-complete" >> awaitExit agent
336314
337315ensure :: Process () -> Process () -> Process ()
338316ensure = flip finally
339317
340−testNSend :: (String -> () -> Process ())
341− -> Maybe LocalNode
342− -> Process ()
343−testNSend op n = do
344− us <- getSelfPid
345− let delay = 5000000
346− let label = "testMxSend" ++ (show us)
347− let isValid = isValidLabel n label
348−
349− testMxSend n label $ \p1 sink -> do
350− register label p1
351− reg1 <- receiveChanTimeout delay sink
352− case reg1 of
353− Just (MxRegistered pd lb)
354− | pd == p1 && isValid lb -> return ()
355− _ -> die $ "Reg-Failed: " ++ show reg1
356−
357− op label ()
358−
359− sent <- receiveChanTimeout delay sink
360− case sent of
361− Just (MxSentToName lb by _)
362− | by == us && isValid lb -> return True
363− _ -> die $ "Send-Failed: " ++ show sent
364−
365− where
366− isValidLabel nd l1 l2
367− | l2 == l2 = True
368− | isJust nd = l2 == l1 ++ "@" ++ show (localNodeId $ fromJust nd)
369− | otherwise = False
370−
371−testSend :: (ProcessId -> () -> Process ())
372− -> Maybe LocalNode
373− -> Process ()
374−testSend op n = do
375− us <- getSelfPid
376− let label = "testMxSend" ++ (show us)
377− testMxSend n label $ \p1 sink -> do
378− -- initiate a send
379− op p1 ()
380−
381− -- verify the management event
382− sent <- receiveChanTimeout 5000000 sink
383− case sent of
384− Just (MxSent pidTo pidFrom _)
385− | pidTo == p1 && pidFrom == us -> return True
386− _ -> return False
387−
388−testChan :: (SendPort () -> () -> Process ())
389− -> Maybe LocalNode
390− -> Process ()
391−testChan op n = testMxSend n "" $ \p1 sink -> do
392−
393− us <- getSelfPid
394− send p1 us
395−
396− cleared <- receiveChanTimeout 2000000 sink
397− case cleared of
398− Just (MxSent pidTo pidFrom _)
399− | pidTo == p1 && pidFrom == us -> return ()
400− _ -> die "Received uncleared Mx Event"
401−
402− chan <- receiveTimeout 5000000 [ match return ]
403− let ch' = fromMaybe (error "No reply chan received") chan
404−
405− -- initiate a send
406− op ch' ()
407−
408− -- verify the management event
409− sent <- receiveChanTimeout 5000000 sink
410− case sent of
411− Just (MxSentToPort sId spId _)
412− | sId == us && spId == sendPortId ch' -> return True
413− _ -> return False
414−
415−type SendTest = ProcessId -> ReceivePort MxEvent -> Process Bool
416−
417−testMxSend :: Maybe LocalNode -> String -> SendTest -> Process ()
418−testMxSend mNode label test = do
419− us <- getSelfPid
420− (sp, rp) <- newChan
421− (chan, sink) <- newChan
422− agent <- mxAgent (MxAgentId $ agentLabel us) () [
423− mxSink $ \ev -> do
424− case ev of
425− m@(MxSentToPort _ cid _)
426− | cid /= sendPortId chan
427− && cid /= sendPortId sp -> liftMX $ sendChan chan m
428− m@(MxSent _ fromPid _)
429− | fromPid == us -> liftMX $ sendChan chan m
430− m@(MxSentToName _ fromPid _)
431− | fromPid == us -> liftMX $ sendChan chan m
432− m@(MxRegistered _ name)
433− | name == label -> liftMX $ sendChan chan m
434− _ -> return ()
435− mxReady
436− ]
437−
438− case mNode of
439− Nothing -> void $ spawnLocal (proc sp)
440− Just remoteNode -> void $ liftIO $ forkProcess remoteNode $ proc sp
441−
442− p1 <- receiveChanTimeout 2000000 rp
443− unless (isJust p1) $ die "Timed out waiting for ProcessId"
444− res <- try $ test (fromJust p1) sink
445−
446− kill agent "bye"
447− kill (fromJust p1) "bye"
448−
449− case res of
450− Left (ProcessExitException _ m) -> (liftIO $ putStrLn $ "SomeException-" ++ show m) >> die m
451− Right tr -> tr `shouldBe` equalTo True
452−
453−
454− where
455− agentLabel s = "mx-unsafe-check-agent-" ++ show s
456− proc sp' = getSelfPid >>= sendChan sp' >> go Nothing
457−
458− go :: Maybe (ReceivePort ()) -> Process ()
459− go Nothing = receiveTimeout 5000000 [ match replyChannel ] >>= go
460− go c@(Just c') = receiveWait [ matchChan c' return ] >> go c
461−
462− replyChannel p' = do
463− (s, r) <- newChan
464− send p' s
465− return r
466−
467318tests :: TestTransport -> IO [Test]
468319tests TestTransport{..} = do
469320 node1 <- newLocalNode testTransport initRemoteTable
470321 node2 <- newLocalNode testTransport initRemoteTable
471322 return [
472− testGroup "MxAgents" [
473− testCase "EventHandling"
323+ testGroup "Mx Agents" [
324+ testCase "Event Handling"
474325 (delayedAssertion
475326 "expected True, but events where not as expected"
476327 node1 True testAgentEventHandling)
477− , testCase "InterAgentBroadcast"
328+ , testCase "Inter-Agent Broadcast"
478329 (delayedAssertion
479330 "expected (), but no broadcast was received"
480− node1 (Just ()) testAgentBroadcast)
481− , testCase "AgentMailboxHandling"
331+ node1 () testAgentBroadcast)
332+ , testCase "Agent Mailbox Handling"
482333 (delayedAssertion
483334 "expected (Just ()), but no regular (mailbox) input was handled"
484335 node1 (Just ()) testAgentMailboxHandling)
485− , testCase "AgentDualInputHandling"
336+ , testCase "Agent Dual Input Handling"
486337 (delayedAssertion
487338 "expected sum = 15, but the result was Nothing"
488339 node1 (Just 15 :: Maybe Int) testAgentDualInput)
489− , testCase "AgentInputPrioritisation"
340+ , testCase "Agent Input Prioritisation"
490341 (delayedAssertion
491342 "expected [first, second, third, fourth, fifth], but result diverged"
492343 node1 (sort ["first", "second",
493344 "third", "fourth",
494345 "fifth"]) testAgentPrioritisation)
495346 ]
496− , testGroup "MxEvents" [
497− testCase "NameRegistrationEvents"
347+ , testGroup "Mx Events" [
348+ testCase "Name Registration Events"
498349 (delayedAssertion
499350 "expected registration events to map to the correct ProcessId"
500351 node1 () testMxRegEvents)
501− , testCase "PostDeathNameUnRegistrationEvents"
352+ , testCase "Post Death Name UnRegistration Events"
502353 (delayedAssertion
503354 "expected process deaths to result in unregistration events"
504355 node1 () (testMxRegMon node2))
505− , testGroup "SendEvents" $ buildTestCases node1 node2
506356 ]
507357 ]
508− where
509− buildTestCases n1 n2 = let nid = localNodeId n2 in build n1 n2 [
510− ("NSend", [
511− ("nsend", testNSend nsend)
512− , ("Unsafe.nsend", testNSend Unsafe.nsend)
513− , ("nsendRemote", testNSend (nsendRemote nid))
514− , ("Unsafe.nsendRemote", testNSend (Unsafe.nsendRemote nid))
515− ])
516− , ("Send", [
517− ("send", testSend send)
518− , ("Unsafe.send", testSend Unsafe.send)
519− , ("usend", testSend usend)
520− , ("Unsafe.usend", testSend Unsafe.usend)
521− , ("sendChan", testChan sendChan)
522− , ("Unsafe.sendChan", testChan Unsafe.sendChan)
523− ])
524− , ("Forward", [
525− ("forward", testSend (\p m -> forward (unsafeCreateUnencodedMessage m) p))
526− , ("uforward", testSend (\p m -> uforward (unsafeCreateUnencodedMessage m) p))
527− ])
528− ]
529−
530− build :: LocalNode
531− -> LocalNode
532− -> [(String, [(String, (Maybe LocalNode -> Process ()))])]
533− -> [Test]
534− build n ln specs =
535− [ testGroup (intercalate "-" [groupName, caseSuffix]) [
536− testCase (intercalate "-" [caseName, caseSuffix])
537− (runProcess n (caseImpl caseNode))
538− | (caseName, caseImpl) <- groupCases
539− ]
540− | (groupName, groupCases) <- specs
541− , (caseSuffix, caseNode) <- [("RemotePid", Just ln), ("LocalPid", Nothing)]
542− ]