git.iko.soy/distributed-process
on master help sign in
20 files changed+893−213
since splitsnapshots
unifiedsplit
.travis.yml+11−6 distributed-process-tests/distributed-process-tests.cabal+20−6 distributed-process-tests/src/Control/Distributed/Process/Tests/CH.hs+179−31 distributed-process-tests/src/Control/Distributed/Process/Tests/Closure.hs+1−1 distributed-process-tests/src/Control/Distributed/Process/Tests/Internal/Utils.hs+16−5 distributed-process-tests/src/Control/Distributed/Process/Tests/Mx.hs+390−53 distributed-process-tests/src/Control/Distributed/Process/Tests/Receive.hs+7−8 distributed-process-tests/tests/runInMemory.hs−1 distributed-process.cabal+2−2 src/Control/Distributed/Process/Internal/Primitives.hs+55−41 src/Control/Distributed/Process/Management.hs+34−2 src/Control/Distributed/Process/Management/Internal/Types.hs+9 src/Control/Distributed/Process/Node.hs+38−19 src/Control/Distributed/Process/UnsafePrimitives.hs+82−33 stack-ghc-7.10.3.yaml+1 stack-ghc-8.0.2.yaml+1−1 stack-ghc-8.2.2.yaml+21 stack-ghc-8.4.4.yaml+20 stack-nightly.yaml+3−3 stack.yaml+3−1
.travis.yml+11−6
@@ -6,11 +6,11 @@ matrix:
66 include:
77 - env: ARGS="--stack-yaml stack-ghc-7.10.3.yaml"
88 addons: {apt: {packages: [libgmp-dev]}}
9−
10− - env: ARGS="--stack-yaml stack-ghc-8.0.2.yaml"
9+ - env: ARGS="--stack-yaml stack-ghc-8.2.2.yaml"
1110 addons: {apt: {packages: [libgmp-dev]}}
12−
13− - env: ARGS=
11+ - env: ARGS="--stack-yaml stack-ghc-8.4.4.yaml"
12+ addons: {apt: {packages: [libgmp-dev]}}
13+ - env: ARGS="--stack-yaml stack-nightly.yaml --resolver nightly"
1414 addons: {apt: {packages: [libgmp-dev]}}
1515
1616cache:
@@ -34,5 +34,10 @@ script:
3434- stack ${ARGS} test $ARG='--plain -t "!Flaky"' ${TEST_PACKAGE}TestCHInTCP
3535- stack ${ARGS} test $ARG='--plain -t "!SpawnReconnect"' ${TEST_PACKAGE}TestClosure
3636- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestStats
37−- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMx
38−- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestTracing
37+- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMxInMemory
38+- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMxInTCP
39+- stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestTracingInMemory
40+
41+notifications:
42+ slack:
43+ secure: LbqbNjK1KiHNiQo/i/Za4vkMD9l9mhmN+PWYFBQkNvGFWffSRayRKFrTqt4znV2p7h4dY1XZFoC7T5RemBVQLq2ppZAUWxkITeu1OUlnmVLDfJLeVYGTR/fn90nP6Y5ITE7T3A07nKmWaRbKpIgFBAOjzgqaM0csscDx3z0WW18=
distributed-process-tests/distributed-process-tests.cabal+20−6
@@ -6,7 +6,7 @@ description: Tests and test suite for Cloud Haskell libraries.
66license: BSD3
77license-file: LICENSE
88Author: Duncan Coutts, Nicolas Wu, Edsko de Vries
9−Maintainer: Facundo Domínguez <facundo.dominguez@tweag.io>
9+Maintainer: Tim Watson <watson.timothy@gmail.com>
1010copyright: Well-Typed LLP
1111category: Control, Cloud Haskell
1212build-type: Simple
@@ -31,6 +31,7 @@ library
3131 bytestring >= 0.9 && < 0.12,
3232 distributed-process >= 0.6.0 && < 0.8,
3333 distributed-static,
34+ exceptions >= 0.5,
3435 HUnit >= 1.2 && < 1.7,
3536 network-transport >= 0.4.1.0 && < 0.6,
3637 network >= 2.5 && < 2.9,
@@ -114,8 +115,7 @@ Test-Suite TestStats
114115 ghc-options: -Wall -eventlog -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
115116 HS-Source-Dirs: tests
116117
117−
118−Test-Suite TestMx
118+Test-Suite TestMxInMemory
119119 Type: exitcode-stdio-1.0
120120 Main-Is: runInMemory.hs
121121 CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Mx
@@ -126,10 +126,10 @@ Test-Suite TestMx
126126 network-transport-inmemory >= 0.5,
127127 test-framework >= 0.6 && < 0.9
128128 Extensions: CPP
129− ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
129+ ghc-options: -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
130130 HS-Source-Dirs: tests
131131
132−Test-Suite TestTracing
132+Test-Suite TestTracingInMemory
133133 Type: exitcode-stdio-1.0
134134 Main-Is: runInMemory.hs
135135 CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Tracing
@@ -140,5 +140,19 @@ Test-Suite TestTracing
140140 network-transport-inmemory >= 0.5,
141141 test-framework >= 0.6 && < 0.9
142142 Extensions: CPP
143− ghc-options: -Wall -eventlog -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
143+ ghc-options: -eventlog -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
144+ HS-Source-Dirs: tests
145+
146+Test-Suite TestMxInTCP
147+ Type: exitcode-stdio-1.0
148+ Main-Is: runInMemory.hs
149+ CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Mx
150+ Build-Depends: base >= 4.4 && < 5,
151+ distributed-process-tests,
152+ network >= 2.3 && < 2.9,
153+ network-transport >= 0.4.1.0 && < 0.6,
154+ network-transport-inmemory >= 0.5,
155+ test-framework >= 0.6 && < 0.9
156+ Extensions: CPP
157+ ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
144158 HS-Source-Dirs: tests
distributed-process-tests/src/Control/Distributed/Process/Tests/CH.hs+179−31
@@ -25,24 +25,32 @@ import Control.Concurrent.MVar
2525 )
2626import Control.Monad (replicateM_, replicateM, forever, void, unless, join)
2727import Control.Exception (SomeException, throwIO, ErrorCall(..))
28−import qualified Control.Exception as Ex (catch)
29−import Control.Applicative ((<$>), (<*>), pure, (<|>))
28+import Control.Monad.Catch (try, catch, finally, mask, onException)
29+import Control.Applicative ((<|>))
3030import qualified Network.Transport as NT (closeEndPoint, EndPointAddress)
31−import Control.Distributed.Process
31+import Control.Distributed.Process hiding
32+ ( try
33+ , catch
34+ , finally
35+ , mask
36+ , onException
37+ )
3238import Control.Distributed.Process.Internal.Types
33− ( NodeId(nodeAddress)
34− , LocalNode(localEndPoint)
39+ ( LocalNode(localEndPoint)
3540 , ProcessExitException(..)
3641 , nullProcessId
3742 , createUnencodedMessage
3843 )
3944import Control.Distributed.Process.Node
45+import Control.Distributed.Process.Debug
46+import Control.Distributed.Process.Management.Internal.Types
47+import Control.Distributed.Process.Tests.Internal.Utils (shouldBe, pause)
4048import Control.Distributed.Process.Serializable (Serializable)
41−
49+import Data.Maybe (isNothing, isJust)
4250import Test.HUnit (Assertion, assertBool, assertFailure)
4351import Test.Framework (Test, testGroup)
4452import Test.Framework.Providers.HUnit (testCase)
45−import Control.Rematch hiding (match)
53+import Control.Rematch hiding (match, isNothing, isJust)
4654import Control.Rematch.Run (Match(..))
4755
4856newtype Ping = Ping ProcessId
@@ -65,7 +73,7 @@ expectThat a matcher = case res of
6573forkTry :: IO () -> IO ThreadId
6674forkTry p = do
6775 tid <- myThreadId
68− forkIO $ Ex.catch p (\e -> throwTo tid (e :: SomeException))
76+ forkIO $ catch p (\e -> throwTo tid (e :: SomeException))
6977
7078-- | The ping server from the paper
7179ping :: Process ()
@@ -79,10 +87,9 @@ verifyClient :: String -> MVar Bool -> IO ()
7987verifyClient s b = takeMVar b >>= assertBool s
8088
8189expectPing :: MVar Bool -> Process ()
82−expectPing mv = expect >>= liftIO . putMVar mv . checkPing
90+expectPing mv = expect >>= liftIO . putMVar mv . checkPing
8391 where
8492 checkPing (Ping _) = True
85− checkPing _ = False
8693
8794-- | Quick and dirty synchronous version of whereisRemoteAsync
8895whereisRemote :: NodeId -> String -> Process (Maybe ProcessId)
@@ -232,10 +239,10 @@ testPing TestTransport{..} = do
232239 pid <- getSelfPid
233240 replicateM_ numPings $ do
234241 send pingServer (Pong pid)
235− p <- expect
242+ p <- expectTimeout 3000000
236243 case p of
237− Ping _ -> return ()
238− _ -> die "Unexpected message"
244+ Just (Ping _) -> return ()
245+ Nothing -> die "Failed to receive Ping"
239246
240247 putMVar clientDone ()
241248
@@ -552,7 +559,7 @@ testMergeChannels TestTransport{..} = do
552559 ss <- liftIO $ mapM readMVar vs
553560 case ss of
554561 [sa, sb, sc] ->
555− mapM_ ((>> liftIO (threadDelay 10000)) . uncurry sendChan)
562+ mapM_ ((>> pause 10000) . uncurry sendChan)
556563 [ -- a, b, c
557564 (sa, 'a')
558565 , (sb, 'b')
@@ -728,7 +735,6 @@ testRemoteRegistry :: TestTransport -> Assertion
728735testRemoteRegistry TestTransport{..} = do
729736 node1 <- newLocalNode testTransport initRemoteTable
730737 node2 <- newLocalNode testTransport initRemoteTable
731− done <- newEmptyMVar
732738
733739 pingServer <- forkProcess node1 ping
734740 deadProcess <- forkProcess node1 (return ())
@@ -743,6 +749,7 @@ testRemoteRegistry TestTransport{..} = do
743749
744750 pid <- verifyWhereIsRemote nid1 "ping"
745751 liftIO $ assertBool "Expected pindServer to match pid" $ pingServer == pid
752+
746753 us <- getSelfPid
747754 nsendRemote nid1 "ping" (Pong us)
748755 receiveWait [
@@ -752,22 +759,22 @@ testRemoteRegistry TestTransport{..} = do
752759 -- test that if process was not registered Nothing is returned
753760 -- in owner field.
754761 registerRemoteAsync nid1 "dead" deadProcess
755− receiveWait [
756− matchIf (\(RegisterReply label' False Nothing) -> "dead" == label')
757− (\(RegisterReply _ _ _) -> return ()) ]
762+ receiveWait [ matchIf (\(RegisterReply label' f mPid) -> "dead" == label')
763+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
764+ ] >>= liftIO . assertBool "Expected False Nothing in RegisterReply"
765+
758766 registerRemoteAsync nid1 "ping" deadProcess
759767 receiveWait [
760− matchIf (\(RegisterReply label' False (Just pid)) ->
761− "ping" == label' && pid == pingServer)
762− (\(RegisterReply _ _ _) -> return ()) ]
768+ matchIf (\(RegisterReply label' False mPid) ->
769+ "ping" == label' && isJust mPid)
770+ (\(RegisterReply _ f (Just pid'')) -> return (not f && pid'' == pingServer))
771+ ] >>= liftIO . assertBool "Expected False and (Just alreadyRegisteredPid) in RegisterReply"
772+
763773 unregisterRemoteAsync nid1 "dead"
764774 receiveWait [
765− matchIf (\(RegisterReply label' False Nothing) ->
766− "dead" == label' && pid == pingServer)
767− (\(RegisterReply _ _ _) -> return ()) ]
768− liftIO $ putMVar done ()
769−
770− takeMVar done
775+ matchIf (\(RegisterReply label' _ _) -> "dead" == label')
776+ (\(RegisterReply _ f mPid) -> return (not f && isNothing mPid))
777+ ] >>= liftIO . assertBool "Expected False and Nothing in RegisterReply"
771778
772779testRemoteRegistryRemoteProcess :: TestTransport -> Assertion
773780testRemoteRegistryRemoteProcess TestTransport{..} = do
@@ -939,9 +946,7 @@ testUSend usendPrim TestTransport{..} numMessages = do
939946 isSorted _ = True
940947 -- The list can't be null since there are no failures after sending
941948 -- the last message.
942− liftIO $ do
943− assertBool "Unexpected failure after sending last msg" $ isSorted msgs && not (null msgs)
944− putMVar usendTestOk ()
949+ liftIO $ putMVar usendTestOk $ isSorted msgs && not (null msgs)
945950
946951 forkProcess node2 $ do
947952 them <- liftIO $ readMVar processA
@@ -952,7 +957,8 @@ testUSend usendPrim TestTransport{..} numMessages = do
952957 usendPrim them i
953958 liftIO (threadDelay 30000)
954959
955− takeMVar usendTestOk
960+ res <- takeMVar usendTestOk
961+ assertBool "Unexpected failure after sending last msg" res
956962
957963-- | Test 'matchAny'. This repeats the 'testMath' but with a proxy server
958964-- in between
@@ -1266,6 +1272,76 @@ testReceiveChanFeatures TestTransport{..} = do
12661272
12671273 takeMVar done
12681274
1275+testChanLifecycle :: TestTransport -> Assertion
1276+testChanLifecycle TestTransport{..} = let delay = 3000000 in do
1277+ result <- newEmptyMVar
1278+ tchMV <- newEmptyMVar
1279+ localNode <- newLocalNode testTransport initRemoteTable
1280+ runProcess localNode $ do
1281+
1282+ pid <- spawnLocal $ do tCh <- newChan :: Process (SendPort (), ReceivePort ())
1283+ liftIO $ putMVar tchMV tCh
1284+ expect :: Process ()
1285+ let (sp, _) = tCh
1286+ sendChan sp ()
1287+ expect :: Process ()
1288+
1289+ mRefPid <- monitor pid
1290+
1291+ cPid <- spawnLocal $ do
1292+ (sp', rp) <- liftIO $ takeMVar tchMV
1293+ -- say "picked up our test channel"
1294+ send pid ()
1295+ -- say "told pid to continue"
1296+ res <- receiveChanTimeout delay rp
1297+ case res of
1298+ Nothing -> say "initial chan () missing!" >> (liftIO $ putMVar result False)
1299+ Just () -> do mr <- monitor pid
1300+ pause 10000
1301+ -- say "sending pid a second () will cause it to exit"
1302+ send pid ()
1303+
1304+ -- say "make sure we see a DOWN notification for pid having stopped"
1305+ receiveWait [ match (\(_ :: ProcessMonitorNotification) -> return ()) ]
1306+
1307+ -- now that pid has died, the send port should be useless...
1308+ liftIO $ putMVar tchMV (sp', rp)
1309+
1310+ -- let's verify that we do not see the message from our
1311+ -- parent process on the channel, once pid has died...
1312+ recv <- receiveChanTimeout delay rp
1313+ -- say $ "finished waiting for second (), writing result" ++ (show recv)
1314+ liftIO $ putMVar result $ isNothing recv
1315+
1316+ mRefCPid <- monitor cPid
1317+
1318+ receiveWait
1319+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefPid)
1320+ (\_ -> return ())
1321+ ]
1322+
1323+ -- say "seen first pid die..."
1324+
1325+ (sendPort, _) <- liftIO $ takeMVar tchMV
1326+ sendChan sendPort ()
1327+ -- say "sent () after owning pid died"
1328+
1329+ -- let cPid know we've written to the channel...
1330+ send cPid ()
1331+
1332+ receiveWait
1333+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == mRefCPid)
1334+ (\_ -> return ())
1335+ ]
1336+
1337+ -- say "seen both pids die now..."
1338+
1339+ -- and wait on the result back in IO land...
1340+ testRes <- takeMVar result
1341+ -- runProcess localNode $ say "got result..."
1342+ assertBool "Expected sending on the channel to fail, but received data!" testRes
1343+
1344+
12691345testKillLocal :: TestTransport -> Assertion
12701346testKillLocal TestTransport{..} = do
12711347 localNode <- newLocalNode testTransport initRemoteTable
@@ -1476,6 +1552,76 @@ testExitRemote TestTransport{..} = do
14761552 takeMVar supervisedDone
14771553 takeMVar supervisorDone
14781554
1555+testRegistryMonitoring :: TestTransport -> Assertion
1556+testRegistryMonitoring TestTransport{..} = do
1557+ node1 <- newLocalNode testTransport initRemoteTable
1558+ node2 <- newLocalNode testTransport initRemoteTable
1559+
1560+ let nid = localNodeId node2
1561+ pid <- forkProcess node1 $ do
1562+ self <- getSelfPid
1563+ runUntilRegistered nid self
1564+ say $ (show self) ++ " registered as " ++ regName
1565+ expect :: Process ()
1566+ say $ (show self) ++ " exiting normally"
1567+
1568+ runProcess node2 $ do
1569+ register regName pid
1570+ say $ regName ++ " registered to " ++ show pid
1571+ res <- whereis regName
1572+ send pid ()
1573+ say $ " sent finish signal to " ++ show pid
1574+ us <- getSelfPid
1575+ liftIO $ assertBool "expected (Just pid)" $ res == (Just pid)
1576+
1577+
1578+ -- This delay isn't essential!
1579+ -- The test case passes perfectly fine without it (feel free to comment out
1580+ -- and see), however waiting a few seconds here, makes it much more likely
1581+ -- that in delayUntilMaybeUnregistered we will hit the match case right
1582+ -- away, and thus not be subjected to a 20 second delay. The value of 4
1583+ -- seconds appears to work optimally on osx and across several linux distros
1584+ -- running in virtual machines (which is essentially what we do in CI)
1585+ void $ receiveTimeout 4000000 [ matchAny return ]
1586+
1587+ -- This delay doesn't serve much purpose in the happy path, however if some
1588+ -- future patch breaks the cooperative behaviour of node controllers viz
1589+ -- remote process registration and notification taking place via ncEffectDied,
1590+ -- there would be the possibility of a race in the test case should we attempt
1591+ -- to evaluate `whereis regName` on node2 right away. In case the name is still
1592+ -- erroneously registered, observing the 20 second delay (or lack of), could at
1593+ -- least give a hint that something is wrong, and we give up our time slice
1594+ -- so that there's a higher change the registrations have been cleaned up
1595+ -- in either case.
1596+ runProcess node2 $ delayUntilMaybeUnregistered nid pid
1597+
1598+ regHere <- newEmptyMVar
1599+ runProcess node2 $ whereis regName >>= liftIO . putMVar regHere
1600+ res <- takeMVar regHere
1601+ case res of
1602+ Nothing -> return ()
1603+ Just pid -> assertBool ("expected Nothing, but got " ++ show pid) False
1604+
1605+ where
1606+ runUntilRegistered nid us = do
1607+ whereisRemoteAsync nid regName
1608+ receiveWait [
1609+ matchIf (\(WhereIsReply n (Just p)) -> n == regName && p == us)
1610+ (const $ return ())
1611+ ]
1612+
1613+ delayUntilMaybeUnregistered nid p = do
1614+ whereisRemoteAsync nid regName
1615+ res <- receiveTimeout 20000000 {- 20 sec delay -} [
1616+ matchIf (\(WhereIsReply n p) -> n == regName && isNothing p)
1617+ (const $ return ())
1618+ ]
1619+ case res of
1620+ Just () -> return ()
1621+ Nothing -> delayUntilMaybeUnregistered nid p
1622+
1623+ regName = "testRegisterRemote"
1624+
14791625testUnsafeSend :: TestTransport -> Assertion
14801626testUnsafeSend TestTransport{..} = do
14811627 serverAddr <- newEmptyMVar
@@ -1668,6 +1814,7 @@ tests testtrans = return [
16681814 , testCase "MatchMessageUnwrap" (testMatchMessageWithUnwrap testtrans)
16691815 , testCase "ReceiveChanTimeout" (testReceiveChanTimeout testtrans)
16701816 , testCase "ReceiveChanFeatures" (testReceiveChanFeatures testtrans)
1817+ , testCase "ChanLifecycle" (testChanLifecycle testtrans)
16711818 , testCase "KillLocal" (testKillLocal testtrans)
16721819 , testCase "KillRemote" (testKillRemote testtrans)
16731820 , testCase "Die" (testDie testtrans)
@@ -1677,6 +1824,7 @@ tests testtrans = return [
16771824 , testCase "MaskRestoreScope" (testMaskRestoreScope testtrans)
16781825 , testCase "ExitLocal" (testExitLocal testtrans)
16791826 , testCase "ExitRemote" (testExitRemote testtrans)
1827+ , testCase "RegistryMonitoring" (testRegistryMonitoring testtrans)
16801828 , testCase "TextCallLocal" (testCallLocal testtrans)
16811829 -- Unsafe Primitives
16821830 , testCase "TestUnsafeSend" (testUnsafeSend testtrans)
distributed-process-tests/src/Control/Distributed/Process/Tests/Closure.hs+1−1
@@ -522,7 +522,7 @@ testSpawnReconnect :: TestTransport -> RemoteTable -> Assertion
522522testSpawnReconnect testtrans@TestTransport{..} rtable = do
523523 [node1, node2] <- replicateM 2 $ newLocalNode testTransport rtable
524524 let nid1 = localNodeId node1
525− nid2 = localNodeId node2
525+ -- nid2 = localNodeId node2
526526 done <- newEmptyMVar
527527 iv <- newMVar (0 :: Int)
528528
distributed-process-tests/src/Control/Distributed/Process/Tests/Internal/Utils.hs+16−5
@@ -20,6 +20,7 @@ module Control.Distributed.Process.Tests.Internal.Utils
2020 -- ping !
2121 , Ping(Ping)
2222 , ping
23+ , pause
2324 , shouldBe
2425 , shouldMatch
2526 , shouldContain
@@ -73,15 +74,16 @@ import Control.Concurrent
7374import Control.Concurrent.MVar
7475 ( putMVar
7576 )
76−import Control.Distributed.Process
77+import Control.Distributed.Process hiding (finally, catch)
7778import Control.Distributed.Process.Node
7879import Control.Distributed.Process.Serializable()
7980
8081import Control.Exception (AsyncException(ThreadKilled), SomeException)
81−import Control.Monad (forever)
82+import Control.Monad (forever, void)
83+import Control.Monad.Catch (finally, catch)
8284import Control.Monad.STM (atomically)
8385import Control.Rematch hiding (match)
84−import Control.Rematch.Run
86+import Control.Rematch.Run
8587import Data.Binary
8688import Data.Typeable (Typeable)
8789
@@ -89,6 +91,7 @@ import Test.HUnit (Assertion, assertFailure)
8991import Test.HUnit.Base (assertBool)
9092
9193import GHC.Generics
94+import System.Timeout (timeout)
9295
9396-- | A mutable cell containing a test result.
9497type TestResult a = MVar a
@@ -107,10 +110,18 @@ data TestProcessControl = Stop | Go | Report ProcessId
107110
108111instance Binary TestProcessControl where
109112
113+data Private = Private
114+ deriving (Typeable, Generic)
115+instance Binary Private where
116+
110117-- | Does exactly what it says on the tin, doing so in the @Process@ monad.
111118noop :: Process ()
112119noop = return ()
113120
121+pause :: Int -> Process ()
122+pause delay =
123+ void $ receiveTimeout delay [ match (\Private -> return ()) ]
124+
114125synchronisedAssertion :: Eq a
115126 => String
116127 -> LocalNode
@@ -223,10 +234,10 @@ testProcessReport pid = do
223234tryRunProcess :: LocalNode -> Process () -> IO ()
224235tryRunProcess node p = do
225236 tid <- liftIO myThreadId
226− runProcess node $ catch p (\e -> liftIO $ throwTo tid (e::SomeException))
237+ void $ timeout (1000000 * 60 * 5 :: Int) $
238+ runProcess node $ catch p (\e -> liftIO $ throwTo tid (e::SomeException))
227239
228240tryForkProcess :: LocalNode -> Process () -> IO ProcessId
229241tryForkProcess node p = do
230242 tid <- liftIO myThreadId
231243 forkProcess node $ catch p (\e -> liftIO $ throwTo tid (e::SomeException))
232−
distributed-process-tests/src/Control/Distributed/Process/Tests/Mx.hs+390−53
@@ -1,12 +1,23 @@
1−{-# LANGUAGE DeriveGeneric #-}
1+{-# LANGUAGE DeriveGeneric #-}
2+{-# LANGUAGE ParallelListComp #-}
3+
24module Control.Distributed.Process.Tests.Mx (tests) where
35
46import Control.Distributed.Process.Tests.Internal.Utils
57import Network.Transport.Test (TestTransport(..))
6−
7−import Control.Concurrent (threadDelay)
8−import Control.Distributed.Process
8+import Control.Distributed.Process hiding (bracket, finally, try)
9+import Control.Distributed.Process.Internal.Types
10+ ( ProcessExitException(..)
11+ , unsafeCreateUnencodedMessage
12+ )
913import Control.Distributed.Process.Node
14+import qualified Control.Distributed.Process.UnsafePrimitives as Unsafe
15+ ( send
16+ , nsend
17+ , nsendRemote
18+ , usend
19+ , sendChan
20+ )
1021import Control.Distributed.Process.Management
1122 ( MxEvent(..)
1223 , MxAgentId(..)
@@ -21,14 +32,15 @@ import Control.Distributed.Process.Management
2132 , mxUpdateLocal
2233 , mxNotify
2334 , mxBroadcast
24− , mxGetId
2535 )
26−import Control.Monad (void)
36+import Control.Monad (void, unless)
37+import Control.Monad.Catch(finally, bracket, try)
38+import Control.Rematch (equalTo)
2739import Data.Binary
28−import Data.List (find, sort)
29−import Data.Maybe (isJust)
40+import Data.List (find, sort, intercalate)
41+import Data.Maybe (isJust, fromJust, isNothing, fromMaybe, catMaybes)
3042import Data.Typeable
31−import GHC.Generics
43+import GHC.Generics hiding (from)
3244#if ! MIN_VERSION_base(4,6,0)
3345import Prelude hiding (catch, log)
3446#endif
@@ -44,7 +56,17 @@ data Publish = Publish
4456
4557instance Binary Publish where
4658
47−testAgentBroadcast :: TestResult () -> Process ()
59+awaitExit :: ProcessId -> Process ()
60+awaitExit pid =
61+ withMonitorRef pid $ \ref -> do
62+ receiveWait
63+ [ matchIf (\(ProcessMonitorNotification r _ _) -> r == ref)
64+ (\_ -> return ())
65+ ]
66+ where
67+ withMonitorRef p = bracket (monitor p) unmonitor
68+
69+testAgentBroadcast :: TestResult (Maybe ()) -> Process ()
4870testAgentBroadcast result = do
4971 (resultSP, resultRP) <- newChan :: Process (SendPort (), ReceivePort ())
5072
@@ -59,7 +81,7 @@ testAgentBroadcast result = do
5981 mxNotify ()
6082 -- Once the publisher has seen our message, it will broadcast the Publish
6183 -- and the consumer will see that and send the result to our typed channel.
62− stash result =<< receiveChan resultRP
84+ stash result =<< receiveChanTimeout 10000000 resultRP
6385
6486 kill publisher "finished"
6587 kill consumer "finished"
@@ -67,7 +89,7 @@ testAgentBroadcast result = do
6789testAgentDualInput :: TestResult (Maybe Int) -> Process ()
6890testAgentDualInput result = do
6991 (sp, rp) <- newChan
70− _ <- mxAgent (MxAgentId "sum-agent") (0 :: Int) [
92+ s <- mxAgent (MxAgentId "sum-agent") (0 :: Int) [
7193 mxSink $ (\(i :: Int) -> do
7294 mxSetLocal . (+i) =<< mxGetLocal
7395 i' <- mxGetLocal
@@ -77,6 +99,8 @@ testAgentDualInput result = do
7799 else mxReady)
78100 ]
79101
102+ mRef <- monitor s
103+
80104 mxNotify (1 :: Int)
81105 nsend "sum-agent" (3 :: Int)
82106 mxNotify (2 :: Int)
@@ -84,6 +108,10 @@ testAgentDualInput result = do
84108 mxNotify (5 :: Int)
85109
86110 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)
87115
88116testAgentPrioritisation :: TestResult [String] -> Process ()
89117testAgentPrioritisation result = do
@@ -95,12 +123,12 @@ testAgentPrioritisation result = do
95123
96124 let name = "prioritising-agent"
97125 (sp, rp) <- newChan
98− void $ mxAgent (MxAgentId name) ["first"] [
99− mxSink (\(s :: String) -> do
100− mxUpdateLocal ((s:))
126+ s <- mxAgent (MxAgentId name) ["first"] [
127+ mxSink (\(s :: String) -> do
128+ mxUpdateLocal (s:)
101129 st <- mxGetLocal
102130 case length st of
103− n | n == 5 -> do liftMX $ sendChan sp st
131+ n | n == 5 -> do liftMX $ sendChan sp (sort st)
104132 mxDeactivate "finished"
105133 _ -> mxReceive -- go to the mailbox
106134 )
@@ -111,23 +139,33 @@ testAgentPrioritisation result = do
111139 mxNotify "fourth"
112140 nsend name "fifth"
113141
114− stash result . sort =<< receiveChan rp
142+ stash result . fromMaybe [] =<< receiveChanTimeout 10000000 rp
143+ awaitExit s
115144
116145testAgentMailboxHandling :: TestResult (Maybe ()) -> Process ()
117146testAgentMailboxHandling result = do
118147 (sp, rp) <- newChan
119− agent <- mxAgent (MxAgentId "listener-agent") () [
148+ agent <- mxAgent (MxAgentId "mailbox-agent") () [
120149 mxSink $ \() -> (liftMX $ sendChan sp ()) >> mxReady
121150 ]
122151
123− nsend "listener-agent" ()
152+ nsend "mailbox-agent" ()
124153
125154 stash result =<< receiveChanTimeout 1000000 rp
126155 kill agent "finished"
127156
128157testAgentEventHandling :: TestResult Bool -> Process ()
129158testAgentEventHandling 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+
130167 let initState = [] :: [MxEvent]
168+ (rc, rs) <- newChan
131169 agentPid <- mxAgent (MxAgentId "lifecycle-listener-agent") initState [
132170 (mxSink $ \ev -> do
133171 st <- mxGetLocal
@@ -136,7 +174,7 @@ testAgentEventHandling result = do
136174 (MxSpawned _) -> mxSetLocal (ev:st)
137175 (MxProcessDied _ _) -> mxSetLocal (ev:st)
138176 _ -> return ()
139− act >> mxReady),
177+ act >> (liftMX $ sendChan rc ()) >> mxReady),
140178 (mxSink $ \(ev, sp :: SendPort Bool) -> do
141179 st <- mxGetLocal
142180 let found =
@@ -156,50 +194,349 @@ testAgentEventHandling result = do
156194 mxReady)
157195 ]
158196
159− _ <- monitor agentPid
160− (sp, rp) <- newChan
161− pid <- spawnLocal $ sendChan sp ()
162− () <- receiveChan rp
197+ -- TODO: yes, this is racy, but we're at the mercy of the scheduler here...
198+ faff 2000000 rs
199+
200+ (sp, rp) <- newChan :: Process (SendPort (), ReceivePort ())
201+
202+ pid <- spawnLocal $ expect >>= sendChan sp
163203
164204 -- By waiting for a monitor notification, we have a
165− -- higher probably that the agent has seen
205+ -- higher probably that the agent has seen the spawn and died events
166206 monitor pid
167− receiveWait [ match (\(ProcessMonitorNotification _ _ _) -> return ()) ]
207+
208+ send pid ()
209+ rct <- receiveChanTimeout 10000000 rp
210+ unless (isJust rct) $ die "No response on channel"
211+
212+ pmn <- receiveTimeout 2000000 [ match (\ProcessMonitorNotification{} -> return ()) ]
213+ unless (isJust pmn) $ die "No monitor notification arrived"
214+
215+ -- TODO: yes, this is racy, but we're at the mercy of the scheduler here...
216+ faff 2000000 rs
168217
169218 (replyTo, reply) <- newChan :: Process (SendPort Bool, ReceivePort Bool)
170219 mxNotify (MxSpawned pid, replyTo)
171220 mxNotify (MxProcessDied pid DiedNormal, replyTo)
172221
173− seenAlive <- receiveChan reply
174− seenDead <- receiveChan reply
222+ seenAlive <- receiveChanTimeout 10000000 reply
223+ seenDead <- receiveChanTimeout 10000000 reply
224+
225+ stash result $ foldr (&&) True $ catMaybes [seenAlive, seenDead]
226+ kill timer "test-complete"
227+ kill agentPid "test-complete"
228+ where
229+ faff delay port = do
230+ res <- receiveChanTimeout delay port
231+ unless (isNothing res) $ pause delay
232+
233+testMxRegEvents :: TestResult () -> Process ()
234+testMxRegEvents result = do
235+ {- This test only deals with the local case, to ensure that we are being
236+ notified in the expected order - the remote cases related to the
237+ behaviour of the node controller are contained in the CH test suite. -}
238+ ensure (stash result ()) $ do
239+ let label = "testMxRegEvents"
240+ let agentLabel = "mxRegEvents-agent"
241+ let delay = 1000000
242+ (regChan, regSink) <- newChan
243+ (unRegChan, unRegSink) <- newChan
244+ agent <- mxAgent (MxAgentId agentLabel) () [
245+ mxSink $ \ev -> do
246+ case ev of
247+ MxRegistered pid label'
248+ | label' == label -> liftMX $ sendChan regChan (label', pid)
249+ MxUnRegistered pid label'
250+ | label' == label -> liftMX $ sendChan unRegChan (label', pid)
251+ _ -> return ()
252+ mxReady
253+ ]
254+
255+ p1 <- spawnLocal expect
256+ p2 <- spawnLocal expect
257+
258+ register label p1
259+ reg1 <- receiveChanTimeout delay regSink
260+ reg1 `shouldBe` equalTo (Just (label, p1))
261+
262+ unregister label
263+ unreg1 <- receiveChanTimeout delay unRegSink
264+ unreg1 `shouldBe` equalTo (Just (label, p1))
265+
266+ register label p2
267+ reg2 <- receiveChanTimeout delay regSink
268+ reg2 `shouldBe` equalTo (Just (label, p2))
269+
270+ reregister label p1
271+ unreg2 <- receiveChanTimeout delay unRegSink
272+ unreg2 `shouldBe` equalTo (Just (label, p2))
273+
274+ reg3 <- receiveChanTimeout delay regSink
275+ reg3 `shouldBe` equalTo (Just (label, p1))
276+
277+ mapM_ (flip kill $ "test-complete") [agent, p1, p2]
278+
279+testMxRegMon :: LocalNode -> TestResult () -> Process ()
280+testMxRegMon remoteNode result = do
281+ ensure (stash result ()) $ do
282+ -- ensure that when a registered process dies, we get a notification that
283+ -- it has been unregistered as well as seeing the name get removed
284+ let label1 = "aaaaa"
285+ let label2 = "bbbbb"
286+ let isValid l = l == label1 || l == label2
287+ let agentLabel = "mxRegMon-agent"
288+ let delay = 1000000
289+ (regChan, regSink) <- newChan
290+ (unRegChan, unRegSink) <- newChan
291+ agent <- mxAgent (MxAgentId agentLabel) () [
292+ mxSink $ \ev -> do
293+ case ev of
294+ MxRegistered pid label
295+ | isValid label -> liftMX $ sendChan regChan (label, pid)
296+ MxUnRegistered pid label
297+ | isValid label -> liftMX $ sendChan unRegChan (label, pid)
298+ _ -> return ()
299+ mxReady
300+ ]
301+
302+ (sp, rp) <- newChan
303+ liftIO $ forkProcess remoteNode $ do
304+ getSelfPid >>= sendChan sp
305+ expect :: Process ()
306+
307+ p1 <- receiveChan rp
308+
309+ register label1 p1
310+ reg1 <- receiveChanTimeout delay regSink
311+ reg1 `shouldBe` equalTo (Just (label1, p1))
312+
313+ register label2 p1
314+ reg2 <- receiveChanTimeout delay regSink
315+ reg2 `shouldBe` equalTo (Just (label2, p1))
316+
317+ n1 <- whereis label1
318+ n1 `shouldBe` equalTo (Just p1)
319+
320+ n2 <- whereis label2
321+ n2 `shouldBe` equalTo (Just p1)
322+
323+ kill p1 "goodbye"
175324
176− stash result $ seenAlive && seenDead
325+ unreg1 <- receiveChanTimeout delay unRegSink
326+ unreg2 <- receiveChanTimeout delay unRegSink
327+
328+ let evts = [unreg1, unreg2]
329+ -- we can't rely on the order of the values in the node controller's
330+ -- map (it's either racy to do so, or no such guarantee exists for Data.Map),
331+ -- so we simply verify that we received the un-registration events we expect
332+ evts `shouldContain` (Just (label1, p1))
333+ evts `shouldContain` (Just (label2, p1))
334+
335+ kill agent "test-complete"
336+
337+ensure :: Process () -> Process () -> Process ()
338+ensure = flip finally
339+
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
177466
178467tests :: TestTransport -> IO [Test]
179468tests TestTransport{..} = do
180469 node1 <- newLocalNode testTransport initRemoteTable
470+ node2 <- newLocalNode testTransport initRemoteTable
181471 return [
182− testGroup "Mx Agents" [
183− testCase "Event Handling"
184− (delayedAssertion
185− "expected True, but events where not as expected"
186− node1 True testAgentEventHandling)
187− , testCase "Inter-Agent Broadcast"
188− (delayedAssertion
189− "expected (), but no broadcast was received"
190− node1 () testAgentBroadcast)
191− , testCase "Agent Mailbox Handling"
192− (delayedAssertion
193− "expected (Just ()), but no regular (mailbox) input was handled"
194− node1 (Just ()) testAgentMailboxHandling)
195− , testCase "Agent Dual Input Handling"
196− (delayedAssertion
197− "expected sum = 15, but the result was Nothing"
198− node1 (Just 15 :: Maybe Int) testAgentDualInput)
199− , testCase "Agent Input Prioritisation"
200− (delayedAssertion
201− "expected [first, second, third, fourth, fifth], but result diverged"
202− node1 (sort ["first", "second",
203− "third", "fourth",
204− "fifth"]) testAgentPrioritisation)
205− ]]
472+ testGroup "MxAgents" [
473+ testCase "EventHandling"
474+ (delayedAssertion
475+ "expected True, but events where not as expected"
476+ node1 True testAgentEventHandling)
477+ , testCase "InterAgentBroadcast"
478+ (delayedAssertion
479+ "expected (), but no broadcast was received"
480+ node1 (Just ()) testAgentBroadcast)
481+ , testCase "AgentMailboxHandling"
482+ (delayedAssertion
483+ "expected (Just ()), but no regular (mailbox) input was handled"
484+ node1 (Just ()) testAgentMailboxHandling)
485+ , testCase "AgentDualInputHandling"
486+ (delayedAssertion
487+ "expected sum = 15, but the result was Nothing"
488+ node1 (Just 15 :: Maybe Int) testAgentDualInput)
489+ , testCase "AgentInputPrioritisation"
490+ (delayedAssertion
491+ "expected [first, second, third, fourth, fifth], but result diverged"
492+ node1 (sort ["first", "second",
493+ "third", "fourth",
494+ "fifth"]) testAgentPrioritisation)
495+ ]
496+ , testGroup "MxEvents" [
497+ testCase "NameRegistrationEvents"
498+ (delayedAssertion
499+ "expected registration events to map to the correct ProcessId"
500+ node1 () testMxRegEvents)
501+ , testCase "PostDeathNameUnRegistrationEvents"
502+ (delayedAssertion
503+ "expected process deaths to result in unregistration events"
504+ node1 () (testMxRegMon node2))
505+ , testGroup "SendEvents" $ buildTestCases node1 node2
506+ ]
507+ ]
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+ ]
distributed-process-tests/src/Control/Distributed/Process/Tests/Receive.hs+7−8
@@ -10,13 +10,12 @@ import Network.Transport.Test (TestTransport(..))
1010
1111import Network.Transport (Transport)
1212import Control.Distributed.Process
13−import Control.Distributed.Process.Closure
1413import Control.Distributed.Process.Node
1514
1615import Control.Monad
1716
1817import Test.HUnit (Assertion, (@?=))
19−import Test.Framework (Test, defaultMain)
18+import Test.Framework (Test)
2019import Test.Framework.Providers.HUnit (testCase)
2120
2221-- Tests:
@@ -43,7 +42,7 @@ recTest2 :: ReceivePort ()
4342 -> SendPort String
4443 -> ReceivePort String -> ReceivePort String
4544 -> Process ()
46−recTest2 wait sync r1 r2 = do
45+recTest2 wait sync r1 _ = do
4746 forever $ do
4847 receiveChan wait
4948 r <- receiveWait
@@ -56,7 +55,7 @@ recTest3 :: ReceivePort ()
5655 -> SendPort String
5756 -> ReceivePort String -> ReceivePort String
5857 -> Process ()
59−recTest3 wait sync r1 r2 = do
58+recTest3 wait sync r1 _ = do
6059 forever $ do
6160 receiveChan wait
6261 r <- receiveWait
@@ -69,7 +68,7 @@ recTest4 :: ReceivePort ()
6968 -> SendPort String
7069 -> ReceivePort String -> ReceivePort String
7170 -> Process ()
72−recTest4 wait sync r1 r2 = do
71+recTest4 wait sync r1 _ = do
7372 forever $ do
7473 receiveChan wait
7574 r <- receiveWait
@@ -83,11 +82,11 @@ master :: Process ()
8382master = do
8483 (waits,waitr) <- newChan
8584 (syncs,syncr) <- newChan
86− let go expect = do
85+ let go expected = do
8786 sendChan waits ()
8887 r <- receiveChan syncr
89− liftIO $ print (r,expect, r == expect)
90− liftIO $ r @?= expect
88+ liftIO $ print (r, expected, r == expected)
89+ liftIO $ r @?= expected
9190
9291 liftIO $ putStrLn "---- Test 1 ----"
9392 (s1,r1) <- newChan
distributed-process-tests/tests/runInMemory.hs−1
@@ -8,7 +8,6 @@ import Network.Transport.Test (TestTransport(..))
88import Network.Transport.InMemory
99import Test.Framework (defaultMainWithArgs)
1010
11−import Control.Concurrent (threadDelay)
1211import System.Environment (getArgs)
1312
1413main :: IO ()
distributed-process.cabal+2−2
@@ -6,7 +6,7 @@ License: BSD3
66License-File: LICENSE
77Copyright: Well-Typed LLP, Tweag I/O Limited
88Author: Duncan Coutts, Nicolas Wu, Edsko de Vries
9−Maintainer: Facundo Domínguez <facundo.dominguez@tweag.io>
9+Maintainer: Tim Watson <watson.timothy@gmail.com>
1010Stability: experimental
1111Homepage: http://haskell-distributed.github.com/
1212Bug-Reports: https://github.com/haskell-distributed/distributed-process/issues
@@ -21,7 +21,7 @@ Description: This is an implementation of Cloud Haskell, as described in
2121
2222 You will probably also want to install a Cloud Haskell backend such
2323 as distributed-process-simplelocalnet.
24−Tested-With: GHC==7.6.3 GHC==7.8.4 GHC==7.10.3 GHC==8.0.1
24+Tested-With: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 GHC==8.4.4
2525Category: Control
2626extra-source-files: ChangeLog
2727
src/Control/Distributed/Process/Internal/Primitives.hs+55−41
@@ -76,6 +76,7 @@ module Control.Distributed.Process.Internal.Primitives
7676 , unlink
7777 , monitor
7878 , unmonitor
79+ , unmonitorAsync
7980 , withMonitor
8081 , withMonitor_
8182 -- * Logging
@@ -253,17 +254,15 @@ send them msg = do
253254 node = processNode proc
254255 nodeId = localNodeId node
255256 destNode = (processNodeId them) in do
256− case destNode == nodeId of
257− True -> sendLocal them msg
258− False -> liftIO $ sendMessage (processNode proc)
259− (ProcessIdentifier (processId proc))
260− (ProcessIdentifier them)
261− NoImplicitReconnect
262− msg
263− -- We do not fire the trace event until after the sending is complete;
264− -- In the remote case, 'sendMessage' can block in the networking stack.
265257 liftIO $ traceEvent (localEventBus node)
266258 (MxSent them us (createUnencodedMessage msg))
259+ if destNode == nodeId
260+ then sendLocal them msg
261+ else liftIO $ sendMessage (processNode proc)
262+ (ProcessIdentifier (processId proc))
263+ (ProcessIdentifier them)
264+ NoImplicitReconnect
265+ msg
267266
268267-- | /Unsafe/ variant of 'send'. This function makes /no/ attempt to serialize
269268-- and (in the case when the destination process resides on the same local
@@ -283,9 +282,12 @@ unsafeSend = Unsafe.send
283282--
284283usend :: Serializable a => ProcessId -> a -> Process ()
285284usend them msg = do
286− here <- getSelfNode
285+ proc <- ask
287286 let there = processNodeId them
288− if here == there
287+ let (us, node) = (processId proc, processNode proc)
288+ let msg' = wrapMessage msg
289+ liftIO $ traceEvent (localEventBus node) (MxSent them us msg')
290+ if localNodeId (processNode proc) == there
289291 then sendLocal them msg
290292 else sendCtrlMsg (Just there) $ UnreliableSend (processLocalId them)
291293 (createMessage msg)
@@ -305,7 +307,13 @@ expect = receiveWait [match return]
305307-- Channels --
306308--------------------------------------------------------------------------------
307309
308−-- | Create a new typed channel
310+-- | Create a new typed channel, bound to the calling Process
311+--
312+-- Note that the channel is bound to the lifecycle of the process that evaluates
313+-- this function, such that when it dies/exits, the channel will no longer
314+-- function, but will remain accessible. Thus reading from the ReceivePort will
315+-- fail silently thereafter, blocking indefinitely (unless a timeout is used).
316+--
309317newChan :: Serializable a => Process (SendPort a, ReceivePort a)
310318newChan = do
311319 proc <- ask
@@ -333,13 +341,16 @@ newChan = do
333341sendChan :: Serializable a => SendPort a -> a -> Process ()
334342sendChan (SendPort cid) msg = do
335343 proc <- ask
336− let node = localNodeId (processNode proc)
337− destNode = processNodeId (sendPortProcessId cid) in do
338− case destNode == node of
344+ let node = processNode proc
345+ pid = processId proc
346+ us = localNodeId node
347+ them = processNodeId (sendPortProcessId cid) in do
348+ liftIO $ traceEvent (localEventBus node) (MxSentToPort pid cid $ wrapMessage msg)
349+ case them == us of
339350 True -> sendChanLocal cid msg
340351 False -> do
341− liftIO $ sendBinary (processNode proc)
342− (ProcessIdentifier (processId proc))
352+ liftIO $ sendBinary node
353+ (ProcessIdentifier pid)
343354 (SendPortIdentifier cid)
344355 NoImplicitReconnect
345356 msg
@@ -483,17 +494,14 @@ forward msg them = do
483494 us = processId proc
484495 nid = localNodeId node
485496 destNode = (processNodeId them) in do
486− case destNode == nid of
487− True -> sendCtrlMsg Nothing (LocalSend them msg)
488− False -> liftIO $ sendPayload (processNode proc)
489− (ProcessIdentifier (processId proc))
490− (ProcessIdentifier them)
491− NoImplicitReconnect
492− (messageToPayload msg)
493− -- We do not fire the trace event until after the sending is complete;
494− -- In the remote case, 'sendMessage' can block in the networking stack.
495− liftIO $ traceEvent (localEventBus node)
496− (MxSent them us msg)
497+ liftIO $ traceEvent (localEventBus node) (MxSent them us msg)
498+ if destNode == nid
499+ then sendCtrlMsg Nothing (LocalSend them msg)
500+ else liftIO $ sendPayload (processNode proc)
501+ (ProcessIdentifier (processId proc))
502+ (ProcessIdentifier them)
503+ NoImplicitReconnect
504+ (messageToPayload msg)
497505
498506-- | Forward a raw 'Message' to the given 'ProcessId'.
499507--
@@ -507,14 +515,10 @@ uforward msg them = do
507515 us = processId proc
508516 nid = localNodeId node
509517 destNode = (processNodeId them) in do
510− case destNode == nid of
511− True -> sendCtrlMsg Nothing (LocalSend them msg)
512− False -> sendCtrlMsg (Just destNode) $ UnreliableSend (processLocalId them)
513− msg
514− -- We do not fire the trace event until after the sending is complete;
515− -- In the remote case, 'sendCtrlMsg' can block in the networking stack.
516− liftIO $ traceEvent (localEventBus node)
517− (MxSent them us msg)
518+ liftIO $ traceEvent (localEventBus node) (MxSent them us msg)
519+ if destNode == nid
520+ then sendCtrlMsg Nothing (LocalSend them msg)
521+ else sendCtrlMsg (Just destNode) $ UnreliableSend (processLocalId them) msg
518522
519523-- | Wrap a 'Serializable' value in a 'Message'. Note that 'Message's are
520524-- 'Serializable' - like the datum they contain - but also note, deserialising
@@ -1223,8 +1227,12 @@ whereisRemoteAsync nid label = do
12231227
12241228-- | Named send to a process in the local registry (asynchronous)
12251229nsend :: Serializable a => String -> a -> Process ()
1226−nsend label msg =
1227− sendCtrlMsg Nothing (NamedSend label (createUnencodedMessage msg))
1230+nsend label msg = do
1231+ proc <- ask
1232+ let msg' = createUnencodedMessage msg
1233+ liftIO $ traceEvent (localEventBus (processNode proc))
1234+ (MxSentToName label (processId proc) msg')
1235+ sendCtrlMsg Nothing (NamedSend label msg')
12281236
12291237-- | Named send to a process in the local registry (asynchronous).
12301238-- This function makes /no/ attempt to serialize and (in the case when the
@@ -1236,9 +1244,15 @@ unsafeNSend = Unsafe.nsend
12361244-- | Named send to a process in a remote registry (asynchronous)
12371245nsendRemote :: Serializable a => NodeId -> String -> a -> Process ()
12381246nsendRemote nid label msg = do
1239− here <- getSelfNode
1240− if here == nid then nsend label msg
1241− else sendCtrlMsg (Just nid) (NamedSend label (createMessage msg))
1247+ proc <- ask
1248+ let us = processId proc
1249+ let node = processNode proc
1250+ if localNodeId node == nid
1251+ then nsend label msg
1252+ else let lbl = label ++ "@" ++ show nid in do
1253+ liftIO $ traceEvent (localEventBus node)
1254+ (MxSentToName lbl us (wrapMessage msg))
1255+ sendCtrlMsg (Just nid) (NamedSend label (createMessage msg))
12421256
12431257-- | Named send to a process in a remote registry (asynchronous)
12441258-- This function makes /no/ attempt to serialize and (in the case when the
src/Control/Distributed/Process/Management.hs+34−2
@@ -76,6 +76,40 @@
7676--
7777-- * Whether messages will be taken from the mailbox first, or the event bus.
7878--
79+-- Since the event bus uses STM broadcast channels to communicate with agents,
80+-- no message written to the bus successfully can be lost.
81+--
82+-- Agents can also receive messages via their mailboxes - these are subject to
83+-- the same guarantees as all inter-process message sending.
84+--
85+-- Messages dispatched on an STM broadcast channel (i.e., management event bus)
86+-- are guaranteed to be delivered with the same FIFO ordering guarantees that
87+-- exist between two communicating processes, such that communication from the
88+-- node controller's threads (i.e., MxEvent's) will never be re-ordered, but
89+-- messages dispatched to the event bus by other processes (including, but not
90+-- limited to agents) are only guaranteed to be ordered between one sender and
91+-- one receiver.
92+--
93+-- No guarantee exists for the ordering in which messages sent to an agent's
94+-- mailbox will be delivered, vs messages dispatched via the event bus.
95+--
96+-- Because of the above, there are no ordering guarantees for messages sent
97+-- between agents, or for processes to agents, except for those that apply to
98+-- messages sent between regular processes, since agents are
99+-- implemented as such.
100+--
101+-- The event bus is serial and single threaded. Anything that is published by
102+-- the node controller will be seen in FIFO order. There are no ordering
103+-- guarantees pertaining to entries published to the event bus by other
104+-- processes or agents.
105+--
106+-- It should not be possible to see, for example, an @MxReceived@ before the
107+-- corresponding @MxSent@ event, since the places where we issue the @MxSent@
108+-- write directly to the event bus (using STM) in the calling (green) thread,
109+-- before dispatching instructions to the node controller to perform the
110+-- necessary routing to deliver the message to a process (or registered name,
111+-- or typed channel) locally or remotely.
112+--
79113-- [Management Data API]
80114--
81115-- Both management agents and clients of the API have access to a variety of
@@ -144,8 +178,6 @@
144178-- > monitorNames = getSelfPid >>= nsend "name-monitor"
145179-- > monitorNames2 = getSelfPid >>= mxNotify
146180--
147−-- For some real-world examples, see the distributed-process-platform package.
148−--
149181-- [Performance, Stablity and Scalability]
150182--
151183-- /Management Agents/ offer numerous advantages over regular processes:
src/Control/Distributed/Process/Management/Internal/Types.hs+9
@@ -21,6 +21,7 @@ import Control.Concurrent.STM
2121import Control.Distributed.Process.Internal.Types
2222 ( Process
2323 , ProcessId
24+ , SendPortId
2425 , Message
2526 , DiedReason
2627 , NodeId
@@ -30,6 +31,7 @@ import qualified Control.Monad.State as ST
3031 ( MonadState
3132 , StateT
3233 )
34+import Control.Monad.Fix (MonadFix)
3335import Data.Binary
3436import Data.Typeable (Typeable)
3537import GHC.Generics
@@ -56,8 +58,14 @@ data MxEvent =
5658 -- ^ fired whenever a node /dies/ (i.e., the connection is broken/disconnected)
5759 | MxSent ProcessId ProcessId Message
5860 -- ^ fired whenever a message is sent from a local process
61+ | MxSentToName String ProcessId Message
62+ -- ^ fired whenever a named send occurs
63+ | MxSentToPort ProcessId SendPortId Message
64+ -- ^ fired whenever a sendChan occurs
5965 | MxReceived ProcessId Message
6066 -- ^ fired whenever a message is received by a local process
67+ | MxReceivedPort SendPortId Message
68+ -- ^ fired whenever a message is received via a typed channel
6169 | MxConnected ConnectionId EndPointAddress
6270 -- ^ fired when a network-transport connection is first established
6371 | MxDisconnected ConnectionId EndPointAddress
@@ -112,6 +120,7 @@ newtype MxAgent s a =
112120 } deriving ( Functor
113121 , Monad
114122 , MonadIO
123+ , MonadFix
115124 , ST.MonadState (MxAgentState s)
116125 , Typeable
117126 , Applicative
src/Control/Distributed/Process/Node.hs+38−19
@@ -28,9 +28,12 @@ import Data.Binary (decode)
2828import Data.Map (Map)
2929import qualified Data.Map as Map
3030 ( empty
31+ , delete
3132 , toList
3233 , fromList
33− , filter
34+ , insert
35+ , lookup
36+ , partition
3437 , partitionWithKey
3538 , elems
3639 , size
@@ -183,6 +186,9 @@ import Control.Distributed.Process.Internal.Types
183186import Control.Distributed.Process.Management.Internal.Agent
184187 ( mxAgentController
185188 )
189+import Control.Distributed.Process.Management.Internal.Types
190+ ( MxEvent(..)
191+ )
186192import qualified Control.Distributed.Process.Management.Internal.Trace.Remote as Trace
187193 ( remoteTable
188194 )
@@ -195,9 +201,6 @@ import Control.Distributed.Process.Management.Internal.Trace.Types
195201 , traceLogFmt
196202 , enableTrace
197203 )
198−import Control.Distributed.Process.Management.Internal.Types
199− ( MxEvent(..)
200− )
201204import Control.Distributed.Process.Serializable (Serializable)
202205import Control.Distributed.Process.Internal.Messaging
203206 ( sendBinary
@@ -210,6 +213,9 @@ import Control.Distributed.Process.Internal.Primitives
210213 , match
211214 , sendChan
212215 , unwrapMessage
216+ , monitor
217+ , unmonitorAsync
218+ , getSelfNode
213219 , SayMessage(..)
214220 )
215221import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
@@ -486,7 +492,7 @@ type IncomingConnection = (NT.EndPointAddress, IncomingTarget)
486492data IncomingTarget =
487493 Uninit
488494 | ToProc ProcessId (Weak (CQueue Message))
489− | ToChan TypedChannel
495+ | ToChan SendPortId TypedChannel
490496 | ToNode
491497
492498data ConnectionState = ConnectionState {
@@ -541,13 +547,17 @@ handleIncomingMessages node = go initConnectionState
541547 enqueue queue msg -- 'enqueue' is strict
542548 trace node (MxReceived pid msg)
543549 go st
544− Just (_, ToChan (TypedChannel chan')) -> do
550+ Just (_, ToChan chId (TypedChannel chan')) -> do
545551 mChan <- deRefWeak chan'
546552 -- If mChan is Nothing, the process has given up the read end of
547553 -- the channel and we simply ignore the incoming message
548− forM_ mChan $ \chan -> atomically $
549− -- We make sure the message is fully decoded when it is enqueued
550− writeTQueue chan $! decode (BSL.fromChunks payload)
554+ forM_ mChan $ \chan -> do
555+ msg' <- atomically $ do
556+ msg <- return $! decode (BSL.fromChunks payload)
557+ -- We make sure the message is fully decoded when it is enqueued
558+ writeTQueue chan msg
559+ return msg
560+ trace node $ MxReceivedPort chId $ unsafeCreateUnencodedMessage msg'
551561 go st
552562 Just (_, ToNode) -> do
553563 let ctrlMsg = decode . BSL.fromChunks $ payload
@@ -574,7 +584,7 @@ handleIncomingMessages node = go initConnectionState
574584 mChannel <- withMVar (processState proc) $ return . (^. typedChannelWithId lcid)
575585 case mChannel of
576586 Just channel ->
577− go (incomingAt cid ^= Just (src, ToChan channel) $ st)
587+ go (incomingAt cid ^= Just (src, ToChan chId channel) $ st)
578588 Nothing ->
579589 invalidRequest cid st $
580590 "incoming attempt to connect to unknown channel of"
@@ -903,7 +913,11 @@ ncEffectDied ident reason = do
903913
904914 modify' $ (links ^= unaffectedLinks') . (monitors ^= unaffectedMons')
905915
906− modify' $ registeredHere ^: Map.filter (\pid -> not $ ident `impliesDeathOf` ProcessIdentifier pid)
916+ -- we now consider all labels for this identifier unregistered
917+ let toDrop pid = not $ ident `impliesDeathOf` ProcessIdentifier pid
918+ (keepNames, dropNames) <- Map.partition toDrop <$> gets (^. registeredHere)
919+ mapM_ (\(p, l) -> liftIO $ trace node (MxUnRegistered l p)) (Map.toList dropNames)
920+ modify' $ registeredHere ^= keepNames
907921
908922 remaining <- fmap Map.toList (gets (^. registeredOnNodes)) >>=
909923 mapM (\(pid,nidlist) ->
@@ -955,7 +969,11 @@ ncEffectRegister from label atnode mPid reregistration = do
955969 do modify' $ registeredHereFor label ^= mPid
956970 updateRemote node currentVal mPid
957971 case mPid of
958− (Just p) -> liftIO $ trace node (MxRegistered p label)
972+ (Just p) -> do
973+ if reregistration
974+ then liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
975+ else return ()
976+ liftIO $ trace node (MxRegistered p label)
959977 Nothing -> liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
960978 newVal <- gets (^. registeredHereFor label)
961979 ncSendToProcess from $ unsafeCreateUnencodedMessage $
@@ -1036,11 +1054,12 @@ ncEffectLocalPortSend from msg = do
10361054 -- If ch is Nothing, the process has given up the read end of
10371055 -- the channel and we simply ignore the incoming message - this
10381056 ch <- deRefWeak chan'
1039− forM_ ch $ \chan -> deliverChan msg chan
1040− where deliverChan :: forall a . Message -> TQueue a -> IO ()
1041− deliverChan (UnencodedMessage _ raw) chan' =
1057+ forM_ ch $ \chan -> deliverChan node from msg chan
1058+ where deliverChan :: forall a . LocalNode -> SendPortId -> Message -> TQueue a -> IO ()
1059+ deliverChan n p (UnencodedMessage _ raw) chan' = do
10421060 atomically $ writeTQueue chan' ((unsafeCoerce raw) :: a)
1043− deliverChan (EncodedMessage _ _) _ =
1061+ trace n (MxReceivedPort p $ unsafeCreateUnencodedMessage raw)
1062+ deliverChan _ _ (EncodedMessage _ _) _ =
10441063 -- this will not happen unless someone screws with Primitives.hs
10451064 error "invalid local channel delivery"
10461065
@@ -1070,7 +1089,7 @@ ncEffectGetInfo from pid =
10701089 case mProc of
10711090 Nothing -> dispatch (isLocal node (ProcessIdentifier from))
10721091 from (ProcessInfoNone DiedUnknownId)
1073− Just proc -> do
1092+ Just proc -> do
10741093 itsLinks <- Set.map fst . BiMultiMap.lookupBy1st them <$>
10751094 gets (^. links)
10761095 itsMons <- BiMultiMap.lookupBy1st them <$> gets (^. monitors)
@@ -1084,8 +1103,8 @@ ncEffectGetInfo from pid =
10841103 infoNode = (processNodeId pid)
10851104 , infoRegisteredNames = reg
10861105 , infoMessageQueueLength = size
1087− , infoMonitors = Set.toList itsMons
1088− , infoLinks = Set.toList itsLinks
1106+ , infoMonitors = Set.toList itsMons
1107+ , infoLinks = Set.toList itsLinks
10891108 }
10901109 where dispatch :: (Serializable a)
10911110 => Bool
src/Control/Distributed/Process/UnsafePrimitives.hs+82−33
@@ -32,7 +32,24 @@
3232-- the /normal/ strategy).
3333--
3434-- Use of the functions in this module can potentially change the runtime
35−-- behaviour of your application. You have been warned!
35+-- behaviour of your application. In addition, messages passed between Cloud
36+-- Haskell processes are written to a tracing infrastructure on the local node,
37+-- to provide improved introspection and debugging facilities for complex actor
38+-- based systems. This module makes no attempt to force evaluation in these
39+-- cases either, thus evaluation problems in passed data structures could not
40+-- only crash your processes, but could also bring down critical internal
41+-- services on which the node relies to function correctly.
42+--
43+-- If you wish to repudiate such issues, you are advised to consider the use
44+-- of NFSerialisable in the distributed-process-extras package, which type
45+-- class brings NFData into scope along with Serializable, such that we can
46+-- force evaluation. Intended for use with modules such as this one, this
47+-- approach guarantees correct evaluatedness in terms of @NFData@. Please note
48+-- however, that we /cannot/ guarantee that an @NFData@ instance will behave the
49+-- same way as a @Binary@ one with regards evaluation, so it is still possible
50+-- to introduce unexpected behaviour by using /unsafe/ primitives in this way.
51+--
52+-- You have been warned!
3653--
3754-- This module is exported so that you can replace the use of Cloud Haskell's
3855-- /safe/ messaging primitives. If you want to use both variants, then you can
@@ -55,7 +72,12 @@ import Control.Distributed.Process.Internal.Messaging
5572 , sendBinary
5673 , sendCtrlMsg
5774 )
58−
75+import Control.Distributed.Process.Management.Internal.Types
76+ ( MxEvent(..)
77+ )
78+import Control.Distributed.Process.Management.Internal.Trace.Types
79+ ( traceEvent
80+ )
5981import Control.Distributed.Process.Internal.Types
6082 ( ProcessId(..)
6183 , NodeId(..)
@@ -79,34 +101,48 @@ import Control.Monad.Reader (ask)
79101
80102-- | Named send to a process in the local registry (asynchronous)
81103nsend :: Serializable a => String -> a -> Process ()
82−nsend label msg =
83− sendCtrlMsg Nothing (NamedSend label (unsafeCreateUnencodedMessage msg))
104+nsend label msg = do
105+ proc <- ask
106+ let us = processId proc
107+ let msg' = wrapMessage msg
108+ -- see [note: tracing]
109+ liftIO $ traceEvent (localEventBus (processNode proc))
110+ (MxSentToName label us msg')
111+ sendCtrlMsg Nothing (NamedSend label msg')
84112
85113-- | Named send to a process in a remote registry (asynchronous)
86114nsendRemote :: Serializable a => NodeId -> String -> a -> Process ()
87115nsendRemote nid label msg = do
88116 proc <- ask
89− if localNodeId (processNode proc) == nid
117+ let us = processId proc
118+ let node = processNode proc
119+ if localNodeId node == nid
90120 then nsend label msg
91− else sendCtrlMsg (Just nid) (NamedSend label (createMessage msg))
121+ else
122+ let lbl = label ++ "@" ++ show nid in do
123+ -- see [note: tracing] NB: this is a remote call to another NC...
124+ liftIO $ traceEvent (localEventBus node)
125+ (MxSentToName lbl us (wrapMessage msg))
126+ sendCtrlMsg (Just nid) (NamedSend label (createMessage msg))
92127
93128-- | Send a message
94129send :: Serializable a => ProcessId -> a -> Process ()
95130send them msg = do
96131 proc <- ask
97132 let node = localNodeId (processNode proc)
98− destNode = (processNodeId them) in do
99− case destNode == node of
100− True -> unsafeSendLocal them msg
101− False -> liftIO $ sendMessage (processNode proc)
102− (ProcessIdentifier (processId proc))
103− (ProcessIdentifier them)
104− NoImplicitReconnect
105− msg
106− where
107− unsafeSendLocal :: (Serializable a) => ProcessId -> a -> Process ()
108− unsafeSendLocal pid msg' =
109− sendCtrlMsg Nothing $ LocalSend pid (unsafeCreateUnencodedMessage msg')
133+ destNode = (processNodeId them)
134+ us = (processId proc)
135+ msg' = wrapMessage msg in do
136+ -- see [note: tracing]
137+ liftIO $ traceEvent (localEventBus (processNode proc))
138+ (MxSent them us msg')
139+ if destNode == node
140+ then sendCtrlMsg Nothing $ LocalSend them msg'
141+ else liftIO $ sendMessage (processNode proc)
142+ (ProcessIdentifier (processId proc))
143+ (ProcessIdentifier them)
144+ NoImplicitReconnect
145+ msg
110146
111147-- | Send a message unreliably.
112148--
@@ -121,30 +157,43 @@ usend :: Serializable a => ProcessId -> a -> Process ()
121157usend them msg = do
122158 proc <- ask
123159 let there = processNodeId them
160+ let (us, node) = (processId proc, processNode proc)
161+ let msg' = wrapMessage msg
162+ -- see [note: tracing]
163+ liftIO $ traceEvent (localEventBus node) (MxSent them us msg')
124164 if localNodeId (processNode proc) == there
125− then sendCtrlMsg Nothing $
126− LocalSend them (unsafeCreateUnencodedMessage msg)
165+ then sendCtrlMsg Nothing $ LocalSend them msg'
127166 else sendCtrlMsg (Just there) $ UnreliableSend (processLocalId them)
128167 (createMessage msg)
129168
169+-- [note: tracing]
170+-- Note that tracing writes to the local node's control channel, and this
171+-- module explicitly specifies to its clients that it does unsafe message
172+-- encoding. The same is true for the messages it puts onto the Management
173+-- event bus, however we do *not* want unevaluated thunks hitting the event
174+-- bus control thread. Hence the word /Unsafe/ in this module's name!
175+--
176+
130177-- | Send a message on a typed channel
131178sendChan :: Serializable a => SendPort a -> a -> Process ()
132179sendChan (SendPort cid) msg = do
133180 proc <- ask
134− let node = localNodeId (processNode proc)
135− destNode = processNodeId (sendPortProcessId cid) in do
136− case destNode == node of
137− True -> unsafeSendChanLocal cid msg
138− False -> do
139− liftIO $ sendBinary (processNode proc)
140− (ProcessIdentifier (processId proc))
141− (SendPortIdentifier cid)
142− NoImplicitReconnect
143− msg
181+ let node = processNode proc
182+ pid = processId proc
183+ us = localNodeId node
184+ them = processNodeId (sendPortProcessId cid)
185+ msg' = wrapMessage msg in do
186+ liftIO $ traceEvent (localEventBus node) (MxSentToPort pid cid msg')
187+ if them == us
188+ then unsafeSendChanLocal cid msg' -- NB: we wrap to P.Message !!!
189+ else liftIO $ sendBinary node
190+ (ProcessIdentifier pid)
191+ (SendPortIdentifier cid)
192+ NoImplicitReconnect
193+ msg
144194 where
145− unsafeSendChanLocal :: (Serializable a) => SendPortId -> a -> Process ()
146− unsafeSendChanLocal spId msg' =
147− sendCtrlMsg Nothing $ LocalPortSend spId (unsafeCreateUnencodedMessage msg')
195+ unsafeSendChanLocal :: SendPortId -> Message -> Process ()
196+ unsafeSendChanLocal p m = sendCtrlMsg Nothing $ LocalPortSend p m
148197
149198-- | Create an unencoded @Message@ for any @Serializable@ type.
150199wrapMessage :: Serializable a => a -> Message
stack-ghc-7.10.3.yaml+1
@@ -14,6 +14,7 @@ extra-deps:
1414- network-transport-0.5.2
1515- network-transport-inmemory-0.5.2
1616- rematch-0.2.0.0
17+- exceptions-0.8.2.1 # test dependency
1718
1819flags:
1920 distributed-process-tests:
stack-ghc-8.0.2.yaml+1−1
@@ -1,5 +1,4 @@
11resolver: lts-9.21
2−
32# added -location for network-transport-tcp-0.6.0
43# since c7fd79 broke the client facing API for createTransport :/
54
@@ -17,6 +16,7 @@ extra-deps:
1716- network-transport-0.5.2
1817- network-transport-inmemory-0.5.2
1918- rematch-0.2.0.0
19+# - exceptions-0.8.2.1 # test dependency
2020
2121flags:
2222 distributed-process-tests:
stack-ghc-8.2.2.yamlnew file+21
@@ -0,0 +1,21 @@
1+resolver: lts-11.22
2+
3+packages:
4+- '.'
5+- distributed-process-tests/
6+- location:
7+ git: https://github.com/haskell-distributed/network-transport-tcp.git
8+ commit: d87d6f55697a94a1fbf211ff9c1bb769a1e129cd
9+ extra-dep: true
10+
11+extra-deps:
12+- rank1dynamic-0.4.0
13+- distributed-static-0.3.8
14+- network-transport-0.5.2
15+- network-transport-inmemory-0.5.2
16+- rematch-0.2.0.0
17+# - exceptions-0.8.2.1 # test dependency
18+
19+flags:
20+ distributed-process-tests:
21+ tcp: true
stack-ghc-8.4.4.yamlnew file+20
@@ -0,0 +1,20 @@
1+resolver: lts-12.18
2+
3+packages:
4+- '.'
5+- distributed-process-tests/
6+- location:
7+ git: https://github.com/haskell-distributed/network-transport-tcp.git
8+ commit: d87d6f55697a94a1fbf211ff9c1bb769a1e129cd
9+ extra-dep: true
10+
11+extra-deps:
12+- rank1dynamic-0.4.0
13+- distributed-static-0.3.8
14+- network-transport-0.5.2
15+- network-transport-inmemory-0.5.2
16+- rematch-0.2.0.0
17+
18+flags:
19+ distributed-process-tests:
20+ tcp: true
stack-nightly.yaml+3−3
@@ -1,4 +1,4 @@
1−resolver: nightly-2018-11-10
1+resolver: nightly
22
33packages:
44- '.'
@@ -9,11 +9,11 @@ packages:
99 extra-dep: true
1010- location:
1111 git: https://github.com/haskell-distributed/network-transport-tcp.git
12− commit: d87d6f55697a94a1fbf211ff9c1bb769a1e129cd
12+ commit: d58250e2388b86a1865ac4139373cbdc106e72e1
1313 extra-dep: true
1414- location:
1515 git: https://github.com/haskell-distributed/network-transport-inmemory.git
16− commit: b7a10ffc07a77f4fe6affbf8abe535b11933a01a
16+ commit: 0ce97924f15a8c1570b2355151834305c9bd2a28
1717 extra-dep: true
1818
1919extra-deps:
stack.yaml+3−1
@@ -1,4 +1,6 @@
1−resolver: nightly-2017-08-20
1+resolver: lts-12.18 # Use GHC 8.4.4
2+
3+# TODO: we can enable nightly-2018-11-11 once PR #319 is merged
24
35packages:
46- '.'