@@ -1,3 +1,12 @@
2+{-# LANGUAGE DeriveDataTypeable #-}
3+{-# LANGUAGE ScopedTypeVariables #-}
4+{-# LANGUAGE RankNTypes #-}
5+{-# LANGUAGE BangPatterns #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE RecordWildCards #-}
8+{-# LANGUAGE MagicHash #-}
1-- | Local nodes
10-- | Local nodes
3module Control.Distributed.Process.Node
12module Control.Distributed.Process.Node
@@ -12,10 +21,6 @@ module Control.Distributed.Process.Node
13-- TODO: Calls to 'sendBinary' and co (by the NC) may stall the node controller.
22-- TODO: Calls to 'sendBinary' and co (by the NC) may stall the node controller.
15−#if ! MIN_VERSION_base(4,6,0)
16−import Prelude hiding (catch)
19import System.IO (fixIO, hPutStrLn, stderr)
24import System.IO (fixIO, hPutStrLn, stderr)
20import System.Mem.Weak (Weak, deRefWeak)
25import System.Mem.Weak (Weak, deRefWeak)
21import qualified Data.ByteString.Lazy as BSL (fromChunks)
26import qualified Data.ByteString.Lazy as BSL (fromChunks)
@@ -23,45 +28,73 @@ import Data.Binary (decode)
23import Data.Map (Map)
28import Data.Map (Map)
24import qualified Data.Map as Map
29import qualified Data.Map as Map
27 , fromList
33 , fromList
29 , partitionWithKey
37 , partitionWithKey
31 , filterWithKey
40 , filterWithKey
32 , foldlWithKey
41 , foldlWithKey
43+import Data.Time.Format (formatTime)
44+#if MIN_VERSION_time(1,5,0)
45+import Data.Time.Format (defaultTimeLocale)
47+import System.Locale (defaultTimeLocale)
34import Data.Set (Set)
49import Data.Set (Set)
35import qualified Data.Set as Set
50import qualified Data.Set as Set
42import Data.Foldable (forM_)
59import Data.Foldable (forM_)
43−import Data.Maybe (isJust, isNothing, catMaybes)
60+import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
44import Data.Typeable (Typeable)
61import Data.Typeable (Typeable)
45import Control.Category ((>>>))
62import Control.Category ((>>>))
46−import Control.Applicative ((<$>))
63+import Control.Applicative
47−import Control.Monad (void, when)
64+import Control.Monad (void, when, join)
48import Control.Monad.IO.Class (MonadIO, liftIO)
65import Control.Monad.IO.Class (MonadIO, liftIO)
49import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
66import Control.Monad.State.Strict (MonadState, StateT, evalStateT, gets)
50import qualified Control.Monad.State.Strict as StateT (get, put)
67import qualified Control.Monad.State.Strict as StateT (get, put)
51import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask)
68import Control.Monad.Reader (MonadReader, ReaderT, runReaderT, ask)
52−import Control.Exception (throwIO, SomeException, Exception, throwTo)
69+import Control.Exception
74+ , uninterruptibleMask_
53−import qualified Control.Exception as Exception (catch)
78+import qualified Control.Exception as Exception
54−import Control.Concurrent (forkIO)
84+import Control.Concurrent (forkIO, killThread)
85+import Control.Distributed.Process.Internal.BiMultiMap (BiMultiMap)
86+import qualified Control.Distributed.Process.Internal.BiMultiMap as BiMultiMap
55import Control.Distributed.Process.Internal.StrictMVar
87import Control.Distributed.Process.Internal.StrictMVar
57 , withMVar
89 , withMVar
58 , modifyMVar
91 , modifyMVar
60 , newEmptyMVar
92 , newEmptyMVar
62 , takeMVar
94 , takeMVar
64import Control.Concurrent.Chan (newChan, writeChan, readChan)
96import Control.Concurrent.Chan (newChan, writeChan, readChan)
97+import qualified Control.Concurrent.MVar as MVar (newEmptyMVar, takeMVar)
65import Control.Concurrent.STM
98import Control.Concurrent.STM
66 ( atomically
99 ( atomically
@@ -70,6 +103,7 @@ import Control.Distributed.Process.Internal.CQueue
70 , enqueue
103 , enqueue
71 , newCQueue
104 , newCQueue
72 , mkWeakCQueue
105 , mkWeakCQueue
74import qualified Network.Transport as NT
108import qualified Network.Transport as NT
75 ( Transport
109 ( Transport
@@ -81,8 +115,8 @@ import qualified Network.Transport as NT
81 , TransportError(..)
115 , TransportError(..)
82 , address
116 , address
83 , closeEndPoint
117 , closeEndPoint
85 , Connection
118 , Connection
87 , EndPointAddress
121 , EndPointAddress
88 , Reliability(ReliableOrdered)
122 , Reliability(ReliableOrdered)
@@ -99,8 +133,11 @@ import Control.Distributed.Process.Internal.Types
99 , LocalProcessId(..)
133 , LocalProcessId(..)
100 , ProcessId(..)
134 , ProcessId(..)
101 , LocalNode(..)
135 , LocalNode(..)
102− , Tracer(InactiveTracer)
136+ , MxEventBus(..)
103 , LocalNodeState(..)
137 , LocalNodeState(..)
138+ , ValidLocalNodeState(..)
139+ , withValidLocalState
140+ , modifyValidLocalState
104 , LocalProcess(..)
141 , LocalProcess(..)
105 , LocalProcessState(..)
142 , LocalProcessState(..)
106 , Process(..)
143 , Process(..)
@@ -110,9 +147,11 @@ import Control.Distributed.Process.Internal.Types
110 , localPidCounter
147 , localPidCounter
111 , localPidUnique
148 , localPidUnique
112 , localProcessWithId
149 , localProcessWithId
113 , localConnections
151 , localConnections
114 , forever'
152 , forever'
115 , MonitorRef(..)
153 , MonitorRef(..)
154+ , NodeClosedException(..)
116 , ProcessMonitorNotification(..)
155 , ProcessMonitorNotification(..)
117 , NodeMonitorNotification(..)
156 , NodeMonitorNotification(..)
118 , PortMonitorNotification(..)
157 , PortMonitorNotification(..)
@@ -132,54 +171,81 @@ import Control.Distributed.Process.Internal.Types
133 , ProcessInfo(..)
172 , ProcessInfo(..)
134 , ProcessInfoNone(..)
173 , ProcessInfoNone(..)
135 , SendPortId(..)
175 , SendPortId(..)
136 , typedChannelWithId
176 , typedChannelWithId
137 , RegisterReply(..)
177 , RegisterReply(..)
138 , WhereIsReply(..)
178 , WhereIsReply(..)
140 , payloadToMessage
179 , payloadToMessage
141 , createUnencodedMessage
180 , createUnencodedMessage
181+ , unsafeCreateUnencodedMessage
142 , runLocalProcess
182 , runLocalProcess
143 , firstNonReservedProcessId
183 , firstNonReservedProcessId
144− , ImplicitReconnect(WithImplicitReconnect, NoImplicitReconnect)
184+ , ImplicitReconnect(WithImplicitReconnect)
186+import Control.Distributed.Process.Management.Internal.Agent
189+import Control.Distributed.Process.Management.Internal.Types
192+import qualified Control.Distributed.Process.Management.Internal.Trace.Remote as Trace
146−import Control.Distributed.Process.Internal.Trace
195+import Control.Distributed.Process.Management.Internal.Trace.Tracer
198+import Control.Distributed.Process.Management.Internal.Trace.Types
147 ( TraceArg(..)
199 ( TraceArg(..)
148− , traceFormat
200+ , traceEvent
149− , startTracing
201+ , traceLogFmt
150− , stopTracer
202+ , enableTrace
152import Control.Distributed.Process.Serializable (Serializable)
204import Control.Distributed.Process.Serializable (Serializable)
153import Control.Distributed.Process.Internal.Messaging
205import Control.Distributed.Process.Internal.Messaging
154 ( sendBinary
206 ( sendBinary
157 , closeImplicitReconnections
207 , closeImplicitReconnections
158 , impliesDeathOf
208 , impliesDeathOf
160import Control.Distributed.Process.Internal.Primitives
210import Control.Distributed.Process.Internal.Primitives
161 ( register
211 ( register
163 , receiveWait
212 , receiveWait
165 , sendChan
214 , sendChan
167−import Control.Distributed.Process.Internal.Types (SendPort)
221+import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
168import qualified Control.Distributed.Process.Internal.Closure.BuiltIn as BuiltIn (remoteTable)
222import qualified Control.Distributed.Process.Internal.Closure.BuiltIn as BuiltIn (remoteTable)
169import Control.Distributed.Process.Internal.WeakTQueue (TQueue, writeTQueue)
223import Control.Distributed.Process.Internal.WeakTQueue (TQueue, writeTQueue)
170import qualified Control.Distributed.Process.Internal.StrictContainerAccessors as DAC
224import qualified Control.Distributed.Process.Internal.StrictContainerAccessors as DAC
171 ( mapMaybe
225 ( mapMaybe
172 , mapDefault
226 , mapDefault
228+import Control.Monad.Catch (try)
229+import GHC.IO (IO(..), unsafeUnmask)
230+import GHC.Base ( maskAsyncExceptions# )
175import Unsafe.Coerce
232import Unsafe.Coerce
235+-- Remove these definitions when the fix for
236+-- https://ghc.haskell.org/trac/ghc/ticket/10149
237+-- is included in all supported compilers:
238+block :: IO a -> IO a
239+block (IO io) = IO $ maskAsyncExceptions# io
240+unblock :: IO a -> IO a
241+unblock = unsafeUnmask
177--------------------------------------------------------------------------------
243--------------------------------------------------------------------------------
178-- Initialization --
244-- Initialization --
179--------------------------------------------------------------------------------
245--------------------------------------------------------------------------------
181initRemoteTable :: RemoteTable
247initRemoteTable :: RemoteTable
182−initRemoteTable = BuiltIn.remoteTable Static.initRemoteTable
248+initRemoteTable = Trace.remoteTable $ BuiltIn.remoteTable Static.initRemoteTable
184-- | Initialize a new local node.
250-- | Initialize a new local node.
185newLocalNode :: NT.Transport -> RemoteTable -> IO LocalNode
251newLocalNode :: NT.Transport -> RemoteTable -> IO LocalNode
@@ -195,68 +261,133 @@ newLocalNode transport rtable = do
195-- | Create a new local node (without any service processes running)
261-- | Create a new local node (without any service processes running)
196createBareLocalNode :: NT.EndPoint -> RemoteTable -> IO LocalNode
262createBareLocalNode :: NT.EndPoint -> RemoteTable -> IO LocalNode
197createBareLocalNode endPoint rtable = do
263createBareLocalNode endPoint rtable = do
198− unq <- randomIO
264+ unq <- randomIO
199− state <- newMVar LocalNodeState
265+ state <- newMVar $ LocalNodeValid $ ValidLocalNodeState
200− { _localProcesses = Map.empty
266+ { _localProcesses = Map.empty
201− , _localPidCounter = firstNonReservedProcessId
267+ , _localPidCounter = firstNonReservedProcessId
202− , _localPidUnique = unq
268+ , _localPidUnique = unq
203− , _localConnections = Map.empty
269+ , _localConnections = Map.empty
205− ctrlChan <- newChan
271+ ctrlChan <- newChan
206− let node = LocalNode { localNodeId = NodeId $ NT.address endPoint
272+ let node = LocalNode { localNodeId = NodeId $ NT.address endPoint
207− , localEndPoint = endPoint
273+ , localEndPoint = endPoint
208− , localState = state
274+ , localState = state
209− , localCtrlChan = ctrlChan
275+ , localCtrlChan = ctrlChan
210− , localTracer = InactiveTracer
276+ , localEventBus = MxEventBusInitialising
211− , remoteTable = rtable
277+ , remoteTable = rtable
213− tracedNode <- startTracing node
279+ tracedNode <- startMxAgent node
281+ -- Once the NC terminates, the endpoint isn't much use,
214− void . forkIO $ runNodeController tracedNode
282+ void $ forkIO $ Exception.finally (runNodeController tracedNode)
283+ (NT.closeEndPoint (localEndPoint node))
285+ -- whilst a closed/failing endpoint will terminate the NC
215− void . forkIO $ handleIncomingMessages tracedNode
286+ void $ forkIO $ Exception.finally (handleIncomingMessages tracedNode)
292+ writeChan (localCtrlChan node) NCMsg
293+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
294+ , ctrlMsgSignal = SigShutdown
297+startMxAgent :: LocalNode -> IO LocalNode
298+startMxAgent node = do
299+ -- see note [tracer/forkProcess races]
300+ let fork = forkProcess node
301+ mv <- MVar.newEmptyMVar
302+ pid <- fork $ mxAgentController fork mv
303+ (tracer', wqRef, mxNew') <- MVar.takeMVar mv
304+ return node { localEventBus = (MxEventBus pid tracer' wqRef mxNew') }
306+startDefaultTracer :: LocalNode -> IO ()
307+startDefaultTracer node' = do
308+ let t = localEventBus node'
310+ MxEventBus _ (Tracer pid _) _ _ -> do
311+ runProcess node' $ register "trace.controller" pid
312+ pid' <- forkProcess node' defaultTracer
313+ enableTrace (localEventBus node') pid'
314+ runProcess node' $ register "tracer.initial" pid'
216− return tracedNode
315+ _ -> return ()
317+-- TODO: we need a better mechanism for defining and registering services
218-- | Start and register the service processes on a node
319-- | Start and register the service processes on a node
219−-- (for now, this is only the logger)
220startServiceProcesses :: LocalNode -> IO ()
320startServiceProcesses :: LocalNode -> IO ()
221startServiceProcesses node = do
321startServiceProcesses node = do
322+ -- tracing /spawns/ relies on the tracer being enabled, but we start
323+ -- the default tracer first, even though it might @nsend@ to the logger
324+ -- before /that/ process has started - this is a totally harmless race
325+ -- however, so we deliberably ignore it
326+ startDefaultTracer node
222 logger <- forkProcess node loop
327 logger <- forkProcess node loop
328+ runProcess node $ do
329+ register "logger" logger
330+ -- The trace.logger is used for tracing to the console to avoid feedback
331+ -- loops during tracing if the user reregisters the "logger" with a custom
332+ -- process which uses 'send' or other primitives which are traced.
223− runProcess node $ register "logger" logger
333+ register "trace.logger" logger
225− loop = do
335+ loop = do
226− receiveWait
336+ receiveWait
227− [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do
337+ [ match $ \(SayMessage time pid string) -> do
338+ let time' = formatTime defaultTimeLocale "%c" time
228− liftIO . hPutStrLn stderr $ time ++ " " ++ show pid ++ ": " ++ string
339+ liftIO . hPutStrLn stderr $ time' ++ " " ++ show pid ++ ": " ++ string
230− , match $ \((time, string) :: (String, String)) -> do
341+ , match $ \((time, string) :: (String, String)) -> do
231− -- this is a 'trace' message from the local node tracer
342+ -- this is a 'trace' message from the local node tracer
232− liftIO . hPutStrLn stderr $ time ++ " [trace] " ++ string
343+ liftIO . hPutStrLn stderr $ time ++ " [trace] " ++ string
234− , match $ \(ch :: SendPort ()) -> -- a shutdown request
345+ , match $ \(ch :: SendPort ()) -> -- a shutdown request
235− sendChan ch ()
346+ sendChan ch ()
238−-- | Force-close a local node
349+-- | Force-close a local node, killing all processes on that node.
240−-- TODO: for now we just close the associated endpoint
241closeLocalNode :: LocalNode -> IO ()
350closeLocalNode :: LocalNode -> IO ()
242−closeLocalNode node =
351+closeLocalNode node = do
352+ -- Kill processes after refilling the mvar. Otherwise, there is potential for
353+ -- deadlock as a dying process tries to get the mvar while masking exceptions
355+ join $ modifyMVar (localState node) $ \st -> case st of
356+ LocalNodeValid vst -> do
357+ return ( LocalNodeClosed
358+ , forM_ (vst ^. localProcesses) $ \lproc ->
359+ -- Semantics of 'throwTo' guarantee that target thread will get
360+ -- delivered an exception. Therefore, target thread will be
361+ -- killed eventually and that's as good as we can do. No need
362+ -- to wait for thread to actually finish dying.
363+ killThread (processThread lproc)
365+ LocalNodeClosed -> return (LocalNodeClosed, return ())
366+ -- This call will have the effect of shutting down the NC as well (see
367+ -- 'createBareLocalNode').
243 NT.closeEndPoint (localEndPoint node)
368 NT.closeEndPoint (localEndPoint node)
245-- | Run a process on a local node and wait for it to finish
370-- | Run a process on a local node and wait for it to finish
246runProcess :: LocalNode -> Process () -> IO ()
371runProcess :: LocalNode -> Process () -> IO ()
247runProcess node proc = do
372runProcess node proc = do
248 done <- newEmptyMVar
373 done <- newEmptyMVar
374+ -- TODO; When forkProcess inherits the masking state, protect the forked
375+ -- thread against async exceptions that could occur before 'try' is evaluated.
249− void $ forkProcess node (proc `finally` liftIO (putMVar done ()))
376+ void $ forkProcess node $ try proc >>= liftIO . putMVar done
250− takeMVar done
377+ takeMVar done >>= either (throwIO :: SomeException -> IO a) return
252-- | Spawn a new process on a local node
379-- | Spawn a new process on a local node
253forkProcess :: LocalNode -> Process () -> IO ProcessId
380forkProcess :: LocalNode -> Process () -> IO ProcessId
381+forkProcess node proc = do
382+ ms <- getMaskingState
254−forkProcess node proc = modifyMVar (localState node) startProcess
383+ modifyMVarMasked (localState node) (startProcess ms)
385+ startProcess :: MaskingState
256− startProcess :: LocalNodeState -> IO (LocalNodeState, ProcessId)
387+ -> IO (LocalNodeState, ProcessId)
257− startProcess st = do
388+ startProcess ms (LocalNodeValid vst) = do
258− let lpid = LocalProcessId { lpidCounter = st ^. localPidCounter
389+ let lpid = LocalProcessId { lpidCounter = vst ^. localPidCounter
259− , lpidUnique = st ^. localPidUnique
390+ , lpidUnique = vst ^. localPidUnique
261 let pid = ProcessId { processNodeId = localNodeId node
392 let pid = ProcessId { processNodeId = localNodeId node
262 , processLocalId = lpid
393 , processLocalId = lpid
@@ -276,43 +407,81 @@ forkProcess node proc = modifyMVar (localState node) startProcess
276 , processThread = tid
407 , processThread = tid
277 , processNode = node
408 , processNode = node
410+ -- Rewrite this code when this is fixed:
411+ -- https://ghc.haskell.org/trac/ghc/ticket/10149
412+ let unmask = case ms of
414+ MaskedInterruptible -> block
415+ MaskedUninterruptible -> id
279− tid' <- forkIO $ do
416+ tid' <- uninterruptibleMask_ $ forkIO $ do
280− reason <- Exception.catch
417+ reason <- Exception.catches
281− (runLocalProcess lproc proc >> return DiedNormal)
418+ (unmask $ runLocalProcess lproc proc >> return DiedNormal)
419+ [ (Exception.Handler (\ex@(ProcessExitException from msg) -> do
420+ mMsg <- unwrapMessage msg :: IO (Maybe String)
422+ Nothing -> return $ DiedException $ show ex
423+ Just m -> return $ DiedException ("exit-from=" ++ (show from) ++ ",reason=" ++ m)))
424+ , (Exception.Handler
282− (return . DiedException . (show :: SomeException -> String))
425+ (return . DiedException . (show :: SomeException -> String)))]
284 -- [Unified: Table 4, rules termination and exiting]
427 -- [Unified: Table 4, rules termination and exiting]
285− modifyMVar_ (localState node) (cleanupProcess pid)
428+ mconns <- modifyValidLocalState node (cleanupProcess pid)
429+ -- XXX: Revisit after agreeing on the bigger picture for the semantics
430+ -- of transport operations.
431+ -- https://github.com/haskell-distributed/distributed-process/issues/204
432+ forM_ mconns $ forkIO . mapM_ NT.close
286 writeChan (localCtrlChan node) NCMsg
434 writeChan (localCtrlChan node) NCMsg
287 { ctrlMsgSender = ProcessIdentifier pid
435 { ctrlMsgSender = ProcessIdentifier pid
288 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason
436 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason
290 return (tid', lproc)
438 return (tid', lproc)
440+ -- see note [tracer/forkProcess races]
441+ trace node (MxSpawned pid)
292 if lpidCounter lpid == maxBound
443 if lpidCounter lpid == maxBound
445+ -- TODO: this doesn't look right at all - how do we know
446+ -- that newUnique represents a process id that is available!?
294 newUnique <- randomIO
447 newUnique <- randomIO
448+ return ( LocalNodeValid
295− return ( (localProcessWithId lpid ^= Just lproc)
449+ $ (localProcessWithId lpid ^= Just lproc)
296 . (localPidCounter ^= firstNonReservedProcessId)
450 . (localPidCounter ^= firstNonReservedProcessId)
297 . (localPidUnique ^= newUnique)
451 . (localPidUnique ^= newUnique)
456+ return ( LocalNodeValid
302− return ( (localProcessWithId lpid ^= Just lproc)
457+ $ (localProcessWithId lpid ^= Just lproc)
303 . (localPidCounter ^: (+ 1))
458 . (localPidCounter ^: (+ 1))
462+ startProcess _ LocalNodeClosed =
463+ throwIO $ NodeClosedException $ localNodeId node
308− cleanupProcess :: ProcessId -> LocalNodeState -> IO LocalNodeState
465+ cleanupProcess :: ProcessId
466+ -> ValidLocalNodeState
467+ -> IO (ValidLocalNodeState, [NT.Connection])
309− cleanupProcess pid st = do
468+ cleanupProcess pid vst = do
310 let pid' = ProcessIdentifier pid
469 let pid' = ProcessIdentifier pid
311− let (affected, unaffected) = Map.partitionWithKey (\(fr, _to) !_v -> impliesDeathOf pid' fr) (st ^. localConnections)
470+ let (affected, unaffected) = Map.partitionWithKey (\(fr, _to) !_v -> impliesDeathOf pid' fr) (vst ^. localConnections)
312− mapM_ (NT.close . fst) (Map.elems affected)
313− return $ (localProcessWithId (processLocalId pid) ^= Nothing)
471+ return ( (localProcessWithId (processLocalId pid) ^= Nothing)
314− . (localConnections ^= unaffected)
472+ . (localConnections ^= unaffected)
474+ , map fst $ Map.elems affected
477+-- note [tracer/forkProcess races]
479+-- Our startTracing function uses forkProcess to start the trace controller
480+-- process, and of course forkProcess attempts to call traceEvent once the
481+-- process has started. This is harmless, as the localEventBus is not updated
482+-- until /after/ the initial forkProcess completes, so the first call to
483+-- traceEvent behaves as if tracing were disabled (i.e., it is ignored).
317--------------------------------------------------------------------------------
486--------------------------------------------------------------------------------
318-- Handle incoming messages --
487-- Handle incoming messages --
@@ -322,8 +491,8 @@ type IncomingConnection = (NT.EndPointAddress, IncomingTarget)
323data IncomingTarget =
492data IncomingTarget =
325− | ToProc (Weak (CQueue Message))
494+ | ToProc ProcessId (Weak (CQueue Message))
326− | ToChan TypedChannel
495+ | ToChan SendPortId TypedChannel
329data ConnectionState = ConnectionState {
498data ConnectionState = ConnectionState {
@@ -350,6 +519,7 @@ incomingFrom addr = aux >>> DAC.mapDefault Set.empty addr
351handleIncomingMessages :: LocalNode -> IO ()
520handleIncomingMessages :: LocalNode -> IO ()
352handleIncomingMessages node = go initConnectionState
521handleIncomingMessages node = go initConnectionState
522+ `Exception.catch` \(NodeClosedException _) -> return ()
354 go :: ConnectionState -> IO ()
524 go :: ConnectionState -> IO ()
355 go !st = do
525 go !st = do
@@ -357,28 +527,37 @@ handleIncomingMessages node = go initConnectionState
357 case event of
527 case event of
358 NT.ConnectionOpened cid rel theirAddr ->
528 NT.ConnectionOpened cid rel theirAddr ->
359 if rel == NT.ReliableOrdered
529 if rel == NT.ReliableOrdered
531+ trace node (MxConnected cid theirAddr)
360− then go ( (incomingAt cid ^= Just (theirAddr, Uninit))
533+ (incomingAt cid ^= Just (theirAddr, Uninit))
361 . (incomingFrom theirAddr ^: Set.insert cid)
534 . (incomingFrom theirAddr ^: Set.insert cid)
364− else invalidRequest cid st
537+ else invalidRequest cid st $
538+ "attempt to connect with unsupported reliability " ++ show rel
365 NT.Received cid payload ->
539 NT.Received cid payload ->
366 case st ^. incomingAt cid of
540 case st ^. incomingAt cid of
367− Just (_, ToProc weakQueue) -> do
541+ Just (_, ToProc pid weakQueue) -> do
368 mQueue <- deRefWeak weakQueue
542 mQueue <- deRefWeak weakQueue
369 forM_ mQueue $ \queue -> do
543 forM_ mQueue $ \queue -> do
370 -- TODO: if we find that the queue is Nothing, should we remove
544 -- TODO: if we find that the queue is Nothing, should we remove
371 -- it from the NC state? (and same for channels, below)
545 -- it from the NC state? (and same for channels, below)
372 let msg = payloadToMessage payload
546 let msg = payloadToMessage payload
373 enqueue queue msg -- 'enqueue' is strict
547 enqueue queue msg -- 'enqueue' is strict
548+ trace node (MxReceived pid msg)
375− Just (_, ToChan (TypedChannel chan')) -> do
550+ Just (_, ToChan chId (TypedChannel chan')) -> do
376 mChan <- deRefWeak chan'
551 mChan <- deRefWeak chan'
377 -- If mChan is Nothing, the process has given up the read end of
552 -- If mChan is Nothing, the process has given up the read end of
378 -- the channel and we simply ignore the incoming message
553 -- the channel and we simply ignore the incoming message
379− forM_ mChan $ \chan -> atomically $
554+ forM_ mChan $ \chan -> do
555+ msg' <- atomically $ do
556+ msg <- return $! decode (BSL.fromChunks payload)
380− -- We make sure the message is fully decoded when it is enqueued
557+ -- We make sure the message is fully decoded when it is enqueued
381− writeTQueue chan $! decode (BSL.fromChunks payload)
558+ writeTQueue chan msg
560+ trace node $ MxReceivedPort chId $ unsafeCreateUnencodedMessage msg'
383 Just (_, ToNode) -> do
562 Just (_, ToNode) -> do
384 let ctrlMsg = decode . BSL.fromChunks $ payload
563 let ctrlMsg = decode . BSL.fromChunks $ payload
@@ -388,37 +567,49 @@ handleIncomingMessages node = go initConnectionState
388 case decode (BSL.fromChunks payload) of
567 case decode (BSL.fromChunks payload) of
389 ProcessIdentifier pid -> do
568 ProcessIdentifier pid -> do
390 let lpid = processLocalId pid
569 let lpid = processLocalId pid
391− mProc <- withMVar state $ return . (^. localProcessWithId lpid)
570+ mProc <- withValidLocalState node $ return . (^. localProcessWithId lpid)
392 case mProc of
571 case mProc of
393 Just proc ->
572 Just proc ->
394− go (incomingAt cid ^= Just (src, ToProc (processWeakQ proc)) $ st)
573+ go (incomingAt cid ^= Just (src, ToProc pid (processWeakQ proc)) $ st)
395 Nothing ->
574 Nothing ->
396− invalidRequest cid st
575+ -- incoming attempt to connect to unknown process - might
577+ go (incomingAt cid ^= Nothing $ st)
397 SendPortIdentifier chId -> do
578 SendPortIdentifier chId -> do
398 let lcid = sendPortLocalId chId
579 let lcid = sendPortLocalId chId
399 lpid = processLocalId (sendPortProcessId chId)
580 lpid = processLocalId (sendPortProcessId chId)
400− mProc <- withMVar state $ return . (^. localProcessWithId lpid)
581+ mProc <- withValidLocalState node $ return . (^. localProcessWithId lpid)
401 case mProc of
582 case mProc of
402 Just proc -> do
583 Just proc -> do
403 mChannel <- withMVar (processState proc) $ return . (^. typedChannelWithId lcid)
584 mChannel <- withMVar (processState proc) $ return . (^. typedChannelWithId lcid)
404 case mChannel of
585 case mChannel of
405 Just channel ->
586 Just channel ->
406− go (incomingAt cid ^= Just (src, ToChan channel) $ st)
587+ go (incomingAt cid ^= Just (src, ToChan chId channel) $ st)
407 Nothing ->
588 Nothing ->
408− invalidRequest cid st
589+ invalidRequest cid st $
590+ "incoming attempt to connect to unknown channel of"
591+ ++ " process " ++ show (sendPortProcessId chId)
409 Nothing ->
592 Nothing ->
410− invalidRequest cid st
593+ -- incoming attempt to connect to channel of unknown
594+ -- process - might be dead already
595+ go (incomingAt cid ^= Nothing $ st)
411 NodeIdentifier nid ->
596 NodeIdentifier nid ->
412 if nid == localNodeId node
597 if nid == localNodeId node
413 then go (incomingAt cid ^= Just (src, ToNode) $ st)
598 then go (incomingAt cid ^= Just (src, ToNode) $ st)
414− else invalidRequest cid st
599+ else invalidRequest cid st $
600+ "incoming attempt to connect to a different node -"
601+ ++ " I'm " ++ show (localNodeId node)
602+ ++ " but the remote peer wants to connect to "
415 Nothing ->
604 Nothing ->
416 invalidRequest cid st
605 invalidRequest cid st
606+ "message received from an unknown connection"
417 NT.ConnectionClosed cid ->
607 NT.ConnectionClosed cid ->
418 case st ^. incomingAt cid of
608 case st ^. incomingAt cid of
419 Nothing ->
609 Nothing ->
420− invalidRequest cid st
610+ invalidRequest cid st "closed unknown connection"
421− Just (src, _) ->
611+ Just (src, _) -> do
612+ trace node (MxDisconnected cid src)
422 go ( (incomingAt cid ^= Nothing)
613 go ( (incomingAt cid ^= Nothing)
423 . (incomingFrom src ^: Set.delete cid)
614 . (incomingFrom src ^: Set.delete cid)
@@ -437,32 +628,30 @@ handleIncomingMessages node = go initConnectionState
439 NT.ErrorEvent (NT.TransportError NT.EventEndPointFailed str) ->
630 NT.ErrorEvent (NT.TransportError NT.EventEndPointFailed str) ->
440− fatal $ "Cloud Haskell fatal error: end point failed: " ++ str
631+ fail $ "Cloud Haskell fatal error: end point failed: " ++ str
441 NT.ErrorEvent (NT.TransportError NT.EventTransportFailed str) ->
632 NT.ErrorEvent (NT.TransportError NT.EventTransportFailed str) ->
442− fatal $ "Cloud Haskell fatal error: transport failed: " ++ str
633+ fail $ "Cloud Haskell fatal error: transport failed: " ++ str
443 NT.EndPointClosed ->
634 NT.EndPointClosed ->
444− stopTracer (localTracer node) >> return ()
635+ return ()
445 NT.ReceivedMulticast _ _ ->
636 NT.ReceivedMulticast _ _ ->
446 -- If we received a multicast message, something went horribly wrong
637 -- If we received a multicast message, something went horribly wrong
447 -- and we just give up
638 -- and we just give up
448− fatal "Cloud Haskell fatal error: received unexpected multicast"
639+ fail "Cloud Haskell fatal error: received unexpected multicast"
450− fatal :: String -> IO ()
451− fatal msg = stopTracer (localTracer node) >> fail msg
453− invalidRequest :: NT.ConnectionId -> ConnectionState -> IO ()
641+ invalidRequest :: NT.ConnectionId -> ConnectionState -> String -> IO ()
454− invalidRequest cid st = do
642+ invalidRequest cid st msg = do
455 -- TODO: We should treat this as a fatal error on the part of the remote
643 -- TODO: We should treat this as a fatal error on the part of the remote
456 -- node. That is, we should report the remote node as having died, and we
644 -- node. That is, we should report the remote node as having died, and we
457 -- should close incoming connections (this requires a Transport layer
645 -- should close incoming connections (this requires a Transport layer
458 -- extension).
646 -- extension).
459− traceEventFmtIO node "" [(TraceStr "[network] invalid request: "),
647+ traceEventFmtIO node "" [ TraceStr $ " [network] invalid request"
648+ ++ " (" ++ msg ++ "): "
460− (Trace cid)]
649+ , (Trace cid)
461 go ( incomingAt cid ^= Nothing
651 go ( incomingAt cid ^= Nothing
465− state = localState node
466 endpoint = localEndPoint node
655 endpoint = localEndPoint node
467 ctrlChan = localCtrlChan node
656 ctrlChan = localCtrlChan node
@@ -471,8 +660,9 @@ handleIncomingMessages node = go initConnectionState
471--------------------------------------------------------------------------------
660--------------------------------------------------------------------------------
473runNodeController :: LocalNode -> IO ()
662runNodeController :: LocalNode -> IO ()
474−runNodeController =
663+runNodeController node =
475− runReaderT (evalStateT (unNC nodeController) initNCState)
664+ runReaderT (evalStateT (unNC nodeController) initNCState) node
665+ `Exception.catch` \(NodeClosedException _) -> return ()
477--------------------------------------------------------------------------------
667--------------------------------------------------------------------------------
478-- Internal data types --
668-- Internal data types --
@@ -480,20 +670,26 @@ runNodeController =
481data NCState = NCState
671data NCState = NCState
482 { -- Mapping from remote processes to linked local processes
672 { -- Mapping from remote processes to linked local processes
483− _links :: !(Map Identifier (Set ProcessId))
673+ _links :: !(BiMultiMap Identifier ProcessId ())
484 -- Mapping from remote processes to monitoring local processes
674 -- Mapping from remote processes to monitoring local processes
485− , _monitors :: !(Map Identifier (Set (ProcessId, MonitorRef)))
675+ , _monitors :: !(BiMultiMap Identifier ProcessId MonitorRef)
486 -- Process registry: names and where they live, mapped to the PIDs
676 -- Process registry: names and where they live, mapped to the PIDs
487 , _registeredHere :: !(Map String ProcessId)
677 , _registeredHere :: !(Map String ProcessId)
488 , _registeredOnNodes :: !(Map ProcessId [(NodeId,Int)])
678 , _registeredOnNodes :: !(Map ProcessId [(NodeId,Int)])
491newtype NC a = NC { unNC :: StateT NCState (ReaderT LocalNode IO) a }
681newtype NC a = NC { unNC :: StateT NCState (ReaderT LocalNode IO) a }
682+ deriving ( Applicative
686+ , MonadState NCState
492− deriving (Functor, Monad, MonadIO, MonadState NCState, MonadReader LocalNode)
687+ , MonadReader LocalNode
494initNCState :: NCState
690initNCState :: NCState
495−initNCState = NCState { _links = Map.empty
691+initNCState = NCState { _links = BiMultiMap.empty
496− , _monitors = Map.empty
692+ , _monitors = BiMultiMap.empty
497 , _registeredHere = Map.empty
693 , _registeredHere = Map.empty
498 , _registeredOnNodes = Map.empty
694 , _registeredOnNodes = Map.empty
@@ -509,34 +705,60 @@ instance Show ProcessKillException where
509 show (ProcessKillException pid reason) =
705 show (ProcessKillException pid reason) =
510 "killed-by=" ++ show pid ++ ",reason=" ++ reason
706 "killed-by=" ++ show pid ++ ",reason=" ++ reason
708+ncSendToProcess :: ProcessId -> Message -> NC ()
709+ncSendToProcess = ncSendToProcessAndTrace True
711+ncSendToProcessAndTrace :: Bool -> ProcessId -> Message -> NC ()
712+ncSendToProcessAndTrace shouldTrace pid msg = do
714+ if processNodeId pid == localNodeId node
715+ then ncEffectLocalSendAndTrace shouldTrace node pid msg
716+ else liftIO $ sendBinary node
717+ (NodeIdentifier $ localNodeId node)
718+ (NodeIdentifier $ processNodeId pid)
719+ WithImplicitReconnect
720+ NCMsg { ctrlMsgSender = NodeIdentifier $ localNodeId node
721+ , ctrlMsgSignal = UnreliableSend (processLocalId pid) msg
724+ncSendToNode :: NodeId -> NCMsg -> NC ()
725+ncSendToNode to msg = do
727+ liftIO $ if to == localNodeId node
728+ then writeChan (localCtrlChan node) $! msg
729+ else sendBinary node
730+ (NodeIdentifier $ localNodeId node)
732+ WithImplicitReconnect
512--------------------------------------------------------------------------------
735--------------------------------------------------------------------------------
513-- Tracing/Debugging --
736-- Tracing/Debugging --
514--------------------------------------------------------------------------------
737--------------------------------------------------------------------------------
516−-- [Issue #104]
739+-- [Issue #104 / DP-13]
518traceNotifyDied :: LocalNode -> Identifier -> DiedReason -> NC ()
741traceNotifyDied :: LocalNode -> Identifier -> DiedReason -> NC ()
519traceNotifyDied node ident reason =
742traceNotifyDied node ident reason =
743+ -- TODO: sendPortDied notifications
744+ liftIO $ withLocalTracer node $ \t ->
520− case reason of
745+ case ident of
746+ (NodeIdentifier nid) -> traceEvent t (MxNodeDied nid reason)
747+ (ProcessIdentifier pid) -> traceEvent t (MxProcessDied pid reason)
521− DiedNormal -> return ()
748+ _ -> return ()
522− _ -> traceNcEventFmt node " "
523− [(TraceStr "[node-controller]"),
527−traceNcEventFmt :: LocalNode -> String -> [TraceArg] -> NC ()
528−traceNcEventFmt node fmt args =
529− liftIO $ traceEventFmtIO node fmt args
531traceEventFmtIO :: LocalNode
750traceEventFmtIO :: LocalNode
532 -> String
751 -> String
533 -> [TraceArg]
752 -> [TraceArg]
535traceEventFmtIO node fmt args =
754traceEventFmtIO node fmt args =
536− withLocalTracer node $ \t -> traceFormat t fmt args
755+ withLocalTracer node $ \t -> traceLogFmt t fmt args
538−withLocalTracer :: LocalNode -> (Tracer -> IO ()) -> IO ()
757+trace :: LocalNode -> MxEvent -> IO ()
758+trace node ev = withLocalTracer node $ \t -> traceEvent t ev
760+withLocalTracer :: LocalNode -> (MxEventBus -> IO ()) -> IO ()
539−withLocalTracer node act = act (localTracer node)
761+withLocalTracer node act = act (localEventBus node)
541--------------------------------------------------------------------------------
763--------------------------------------------------------------------------------
542-- Core functionality --
764-- Core functionality --
@@ -552,11 +774,7 @@ nodeController = do
552 -- [Unified: Table 7, rule nc_forward]
774 -- [Unified: Table 7, rule nc_forward]
553 case destNid (ctrlMsgSignal msg) of
775 case destNid (ctrlMsgSignal msg) of
554 Just nid' | nid' /= localNodeId node ->
776 Just nid' | nid' /= localNodeId node ->
555− liftIO $ sendBinary node
777+ ncSendToNode nid' msg
557− (NodeIdentifier nid')
558− WithImplicitReconnect
561 return ()
779 return ()
@@ -577,10 +795,12 @@ nodeController = do
577 ncEffectRegister from label atnode pid force
795 ncEffectRegister from label atnode pid force
578 NCMsg (ProcessIdentifier from) (WhereIs label) ->
796 NCMsg (ProcessIdentifier from) (WhereIs label) ->
579 ncEffectWhereIs from label
797 ncEffectWhereIs from label
580− NCMsg from (NamedSend label msg') ->
798+ NCMsg _ (NamedSend label msg') ->
581− ncEffectNamedSend from label msg'
799+ ncEffectNamedSend label msg'
800+ NCMsg _ (UnreliableSend lpid msg') ->
801+ ncEffectLocalSend node (ProcessId (localNodeId node) lpid) msg'
582 NCMsg _ (LocalSend to msg') ->
802 NCMsg _ (LocalSend to msg') ->
583− ncEffectLocalSend to msg'
803+ ncEffectLocalSend node to msg'
584 NCMsg _ (LocalPortSend to msg') ->
804 NCMsg _ (LocalPortSend to msg') ->
585 ncEffectLocalPortSend to msg'
805 ncEffectLocalPortSend to msg'
586 NCMsg (ProcessIdentifier from) (Kill to reason) ->
806 NCMsg (ProcessIdentifier from) (Kill to reason) ->
@@ -589,6 +809,12 @@ nodeController = do
589 ncEffectExit from to reason
809 ncEffectExit from to reason
590 NCMsg (ProcessIdentifier from) (GetInfo pid) ->
810 NCMsg (ProcessIdentifier from) (GetInfo pid) ->
591 ncEffectGetInfo from pid
811 ncEffectGetInfo from pid
812+ NCMsg _ SigShutdown ->
814+ NT.closeEndPoint (localEndPoint node)
815+ `Exception.finally` throwIO (NodeClosedException $ localNodeId node)
816+ NCMsg (ProcessIdentifier from) (GetNodeStats nid) ->
817+ ncEffectGetNodeStats from nid
592 unexpected ->
818 unexpected ->
593 error $ "nodeController: unexpected message " ++ show unexpected
819 error $ "nodeController: unexpected message " ++ show unexpected
@@ -606,22 +832,18 @@ ncEffectMonitor from them mRef = do
606 case (shouldLink, isLocal node (ProcessIdentifier from)) of
832 case (shouldLink, isLocal node (ProcessIdentifier from)) of
607 (True, _) -> -- [Unified: first rule]
833 (True, _) -> -- [Unified: first rule]
608 case mRef of
834 case mRef of
609− Just ref -> modify' $ monitorsFor them ^: Set.insert (from, ref)
835+ Just ref -> modify' $ monitors ^: BiMultiMap.insert them from ref
610− Nothing -> modify' $ linksFor them ^: Set.insert from
836+ Nothing -> modify' $ links ^: BiMultiMap.insert them from ()
611 (False, True) -> -- [Unified: second rule]
837 (False, True) -> -- [Unified: second rule]
612 notifyDied from them DiedUnknownId mRef
838 notifyDied from them DiedUnknownId mRef
613 (False, False) -> -- [Unified: third rule]
839 (False, False) -> -- [Unified: third rule]
614 -- TODO: this is the right sender according to the Unified semantics,
840 -- TODO: this is the right sender according to the Unified semantics,
615 -- but perhaps having 'them' as the sender would make more sense
841 -- but perhaps having 'them' as the sender would make more sense
616 -- (see also: notifyDied)
842 -- (see also: notifyDied)
617− liftIO $ sendBinary node
618− (NodeIdentifier $ localNodeId node)
619− (NodeIdentifier $ processNodeId from)
843+ ncSendToNode (processNodeId from) $ NCMsg
620− WithImplicitReconnect
622− { ctrlMsgSender = NodeIdentifier (localNodeId node)
844+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
623− , ctrlMsgSignal = Died them DiedUnknownId
845+ , ctrlMsgSignal = Died them DiedUnknownId
626-- [Unified: Table 11]
848-- [Unified: Table 11]
627ncEffectUnlink :: ProcessId -> Identifier -> NC ()
849ncEffectUnlink :: ProcessId -> Identifier -> NC ()
@@ -635,7 +857,7 @@ ncEffectUnlink from them = do
635 postAsMessage from $ DidUnlinkNode nid
857 postAsMessage from $ DidUnlinkNode nid
636 SendPortIdentifier cid ->
858 SendPortIdentifier cid ->
637 postAsMessage from $ DidUnlinkPort cid
859 postAsMessage from $ DidUnlinkPort cid
638− modify' $ linksFor them ^: Set.delete from
860+ modify' $ links ^: BiMultiMap.delete them from ()
640-- [Unified: Table 11]
862-- [Unified: Table 11]
641ncEffectUnmonitor :: ProcessId -> MonitorRef -> NC ()
863ncEffectUnmonitor :: ProcessId -> MonitorRef -> NC ()
@@ -643,7 +865,7 @@ ncEffectUnmonitor from ref = do
643 node <- ask
865 node <- ask
644 when (isLocal node (ProcessIdentifier from)) $
866 when (isLocal node (ProcessIdentifier from)) $
645 postAsMessage from $ DidUnmonitor ref
867 postAsMessage from $ DidUnmonitor ref
646− modify' $ monitorsFor (monitorRefIdent ref) ^: Set.delete (from, ref)
868+ modify' $ monitors ^: BiMultiMap.delete (monitorRefIdent ref) from ref
648-- [Unified: Table 12]
870-- [Unified: Table 12]
649ncEffectDied :: Identifier -> DiedReason -> NC ()
871ncEffectDied :: Identifier -> DiedReason -> NC ()
@@ -658,7 +880,7 @@ ncEffectDied ident reason = do
658 let localOnly = case ident of NodeIdentifier _ -> True ; _ -> False
880 let localOnly = case ident of NodeIdentifier _ -> True ; _ -> False
660 forM_ (Map.toList affectedLinks) $ \(them, uss) ->
882 forM_ (Map.toList affectedLinks) $ \(them, uss) ->
661− forM_ uss $ \us ->
883+ forM_ uss $ \(us, _) ->
662 when (localOnly <= isLocal node (ProcessIdentifier us)) $
884 when (localOnly <= isLocal node (ProcessIdentifier us)) $
663 notifyDied us them reason Nothing
885 notifyDied us them reason Nothing
@@ -667,9 +889,35 @@ ncEffectDied ident reason = do
667 when (localOnly <= isLocal node (ProcessIdentifier us)) $
889 when (localOnly <= isLocal node (ProcessIdentifier us)) $
668 notifyDied us them reason (Just ref)
890 notifyDied us them reason (Just ref)
892+ -- Notify remote nodes that the process died so it can be removed from monitor
894+ mapM_ (forwardDeath node) $
895+ [ nid | ProcessIdentifier pid <- [ident]
896+ , i <- Set.toList $ Set.union
897+ (Set.map fst $ BiMultiMap.lookupBy2nd pid unaffectedLinks)
898+ (Set.map fst $ BiMultiMap.lookupBy2nd pid unaffectedMons)
899+ , let nid = nodeOf i
900+ , nid /= localNodeId node
903+ -- Delete monitors in the local node.
904+ let deleteDeads :: (Ord a, Ord v)
905+ => BiMultiMap a ProcessId v -> BiMultiMap a ProcessId v
906+ deleteDeads = case ident of
907+ -- deleteAllBy2nd is faster than partitionWithKeyBy2nd
908+ ProcessIdentifier pid -> BiMultiMap.deleteAllBy2nd pid
909+ _ -> snd . BiMultiMap.partitionWithKeyBy2nd
910+ (\pid _ -> ident `impliesDeathOf` ProcessIdentifier pid)
911+ unaffectedLinks' = deleteDeads unaffectedLinks
912+ unaffectedMons' = deleteDeads unaffectedMons
670− modify' $ (links ^= unaffectedLinks) . (monitors ^= unaffectedMons)
914+ modify' $ (links ^= unaffectedLinks') . (monitors ^= unaffectedMons')
916+ -- we now consider all labels for this identifier unregistered
672− modify' $ registeredHere ^: Map.filter (\pid -> not $ ident `impliesDeathOf` ProcessIdentifier pid)
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
674 remaining <- fmap Map.toList (gets (^. registeredOnNodes)) >>=
922 remaining <- fmap Map.toList (gets (^. registeredOnNodes)) >>=
675 mapM (\(pid,nidlist) ->
923 mapM (\(pid,nidlist) ->
@@ -677,20 +925,15 @@ ncEffectDied ident reason = do
678 do forM_ nidlist $ \(nid,_) ->
926 do forM_ nidlist $ \(nid,_) ->
679 when (not $ isLocal node (NodeIdentifier nid))
927 when (not $ isLocal node (NodeIdentifier nid))
680− (forwardNameDeath node nid)
928+ (forwardDeath node nid)
681 return Nothing
929 return Nothing
682 False -> return $ Just (pid,nidlist) )
930 False -> return $ Just (pid,nidlist) )
683 modify' $ registeredOnNodes ^= (Map.fromList (catMaybes remaining))
931 modify' $ registeredOnNodes ^= (Map.fromList (catMaybes remaining))
685− forwardNameDeath node nid =
933+ forwardDeath node nid = ncSendToNode nid
686− liftIO $ sendBinary node
687− (NodeIdentifier $ localNodeId node)
688− (NodeIdentifier $ nid)
689− WithImplicitReconnect
691− { ctrlMsgSender = NodeIdentifier (localNodeId node)
934+ NCMsg { ctrlMsgSender = NodeIdentifier (localNodeId node)
692− , ctrlMsgSignal = Died ident reason
935+ , ctrlMsgSignal = Died ident reason
695-- [Unified: Table 13]
938-- [Unified: Table 13]
696ncEffectSpawn :: ProcessId -> Closure (Process ()) -> SpawnRef -> NC ()
939ncEffectSpawn :: ProcessId -> Closure (Process ()) -> SpawnRef -> NC ()
@@ -698,16 +941,13 @@ ncEffectSpawn pid cProc ref = do
698 mProc <- unClosure cProc
941 mProc <- unClosure cProc
699 -- If the closure does not exist, we spawn a process that throws an exception
942 -- If the closure does not exist, we spawn a process that throws an exception
700 -- This allows the remote node to find out what's happening
943 -- This allows the remote node to find out what's happening
701 let proc = case mProc of
945 let proc = case mProc of
702 Left err -> fail $ "Error: Could not resolve closure: " ++ err
946 Left err -> fail $ "Error: Could not resolve closure: " ++ err
703 Right p -> p
947 Right p -> p
704 node <- ask
948 node <- ask
705 pid' <- liftIO $ forkProcess node proc
949 pid' <- liftIO $ forkProcess node proc
706− liftIO $ sendMessage node
950+ ncSendToProcess pid $ unsafeCreateUnencodedMessage $ DidSpawn ref pid'
707− (NodeIdentifier (localNodeId node))
708− (ProcessIdentifier pid)
709− WithImplicitReconnect
712-- Unified semantics does not explicitly describe how to implement 'register',
952-- Unified semantics does not explicitly describe how to implement 'register',
713-- but mentions it's "very similar to nsend" (Table 14)
953-- but mentions it's "very similar to nsend" (Table 14)
@@ -725,14 +965,19 @@ ncEffectRegister from label atnode mPid reregistration = do
725 return $ (isNothing currentVal /= reregistration) &&
965 return $ (isNothing currentVal /= reregistration) &&
726 (not (isLocal node (ProcessIdentifier thepid) ) || isvalidlocal )
966 (not (isLocal node (ProcessIdentifier thepid) ) || isvalidlocal )
727 if isLocal node (NodeIdentifier atnode)
967 if isLocal node (NodeIdentifier atnode)
728− then do when (isOk) $
968+ then do when isOk $
729 do modify' $ registeredHereFor label ^= mPid
969 do modify' $ registeredHereFor label ^= mPid
730 updateRemote node currentVal mPid
970 updateRemote node currentVal mPid
731− liftIO $ sendMessage node
971+ case mPid of
732− (NodeIdentifier (localNodeId node))
972+ (Just p) -> do
733− (ProcessIdentifier from)
973+ if reregistration
734− WithImplicitReconnect
974+ then liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
976+ liftIO $ trace node (MxRegistered p label)
977+ Nothing -> liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
978+ newVal <- gets (^. registeredHereFor label)
979+ ncSendToProcess from $ unsafeCreateUnencodedMessage $
735− (RegisterReply label isOk)
980+ RegisterReply label isOk newVal
736 else let operation =
981 else let operation =
737 case reregistration of
982 case reregistration of
738 True -> flip decList
983 True -> flip decList
@@ -750,6 +995,7 @@ ncEffectRegister from label atnode mPid reregistration = do
750 updateRemote _ _ _ = return ()
995 updateRemote _ _ _ = return ()
751 maybeify f Nothing = unmaybeify $ f []
996 maybeify f Nothing = unmaybeify $ f []
752 maybeify f (Just x) = unmaybeify $ f x
997 maybeify f (Just x) = unmaybeify $ f x
753 unmaybeify [] = Nothing
999 unmaybeify [] = Nothing
754 unmaybeify x = Just x
1000 unmaybeify x = Just x
755 incList [] tag = [(tag,1)]
1001 incList [] tag = [(tag,1)]
@@ -761,51 +1007,44 @@ ncEffectRegister from label atnode mPid reregistration = do
761 decList (x:xs) tag = x:decList xs tag
1007 decList (x:xs) tag = x:decList xs tag
762 forward node to reg =
1008 forward node to reg =
763 when (not $ isLocal node (NodeIdentifier to)) $
1009 when (not $ isLocal node (NodeIdentifier to)) $
764− liftIO $ sendBinary node
765− (ProcessIdentifier from)
767− WithImplicitReconnect
769− { ctrlMsgSender = ProcessIdentifier from
1010+ ncSendToNode to $ NCMsg { ctrlMsgSender = ProcessIdentifier from
770− , ctrlMsgSignal = reg
1011+ , ctrlMsgSignal = reg
774-- Unified semantics does not explicitly describe 'whereis'
1015-- Unified semantics does not explicitly describe 'whereis'
775ncEffectWhereIs :: ProcessId -> String -> NC ()
1016ncEffectWhereIs :: ProcessId -> String -> NC ()
776ncEffectWhereIs from label = do
1017ncEffectWhereIs from label = do
778 mPid <- gets (^. registeredHereFor label)
1018 mPid <- gets (^. registeredHereFor label)
779− liftIO $ sendMessage node
780− (NodeIdentifier (localNodeId node))
781− (ProcessIdentifier from)
782− WithImplicitReconnect
783− (WhereIsReply label mPid)
1019+ ncSendToProcess from $ unsafeCreateUnencodedMessage $ WhereIsReply label mPid
785-- [Unified: Table 14]
1021-- [Unified: Table 14]
786−ncEffectNamedSend :: Identifier -> String -> Message -> NC ()
1022+ncEffectNamedSend :: String -> Message -> NC ()
787−ncEffectNamedSend from label msg = do
1023+ncEffectNamedSend label msg = do
789 mPid <- gets (^. registeredHereFor label)
1024 mPid <- gets (^. registeredHereFor label)
790 -- If mPid is Nothing, we just ignore the named send (as per Table 14)
1025 -- If mPid is Nothing, we just ignore the named send (as per Table 14)
791− forM_ mPid $ \pid ->
1026+ forM_ mPid $ \to ->
792− liftIO $ sendPayload node
1027+ -- If this is a trace message we don't trace it to avoid entering a loop
793− from
1028+ -- where trace messages produce more trace messages.
794− (ProcessIdentifier pid)
1029+ ncSendToProcessAndTrace (label /= "trace.logger") to msg
796− (messageToPayload msg)
798-- [Issue #DP-20]
1031-- [Issue #DP-20]
799−ncEffectLocalSend :: ProcessId -> Message -> NC ()
1032+ncEffectLocalSend :: LocalNode -> ProcessId -> Message -> NC ()
800−ncEffectLocalSend = postMessage
1033+ncEffectLocalSend = ncEffectLocalSendAndTrace True
1035+ncEffectLocalSendAndTrace :: Bool -> LocalNode -> ProcessId -> Message -> NC ()
1036+ncEffectLocalSendAndTrace shouldTrace node to msg =
1037+ liftIO $ withLocalProc node to $ \p -> do
1038+ enqueue (processQueue p) msg
1039+ when shouldTrace $ trace node (MxReceived to msg)
802-- [Issue #DP-20]
1041-- [Issue #DP-20]
803ncEffectLocalPortSend :: SendPortId -> Message -> NC ()
1042ncEffectLocalPortSend :: SendPortId -> Message -> NC ()
804−ncEffectLocalPortSend from msg =
1043+ncEffectLocalPortSend from msg = do
805 let pid = sendPortProcessId from
1045 let pid = sendPortProcessId from
806 cid = sendPortLocalId from
1046 cid = sendPortLocalId from
808− withLocalProc pid $ \proc -> do
1047+ liftIO $ withLocalProc node pid $ \proc -> do
809 mChan <- withMVar (processState proc) $ return . (^. typedChannelWithId cid)
1048 mChan <- withMVar (processState proc) $ return . (^. typedChannelWithId cid)
810 case mChan of
1049 case mChan of
811 -- in the unlikely event we know nothing about this channel id,
1050 -- in the unlikely event we know nothing about this channel id,
@@ -815,11 +1054,12 @@ ncEffectLocalPortSend from msg =
815 -- If ch is Nothing, the process has given up the read end of
1054 -- If ch is Nothing, the process has given up the read end of
816 -- the channel and we simply ignore the incoming message - this
1055 -- the channel and we simply ignore the incoming message - this
817 ch <- deRefWeak chan'
1056 ch <- deRefWeak chan'
818− forM_ ch $ \chan -> deliverChan msg chan
1057+ forM_ ch $ \chan -> deliverChan node from msg chan
819− where deliverChan :: forall a . Message -> TQueue a -> IO ()
1058+ where deliverChan :: forall a . LocalNode -> SendPortId -> Message -> TQueue a -> IO ()
820− deliverChan (UnencodedMessage _ raw) chan' =
1059+ deliverChan n p (UnencodedMessage _ raw) chan' = do
821 atomically $ writeTQueue chan' ((unsafeCoerce raw) :: a)
1060 atomically $ writeTQueue chan' ((unsafeCoerce raw) :: a)
1061+ trace n (MxReceivedPort p $ unsafeCreateUnencodedMessage raw)
822− deliverChan (EncodedMessage _ _) _ =
1062+ deliverChan _ _ (EncodedMessage _ _) _ =
823 -- this will not happen unless someone screws with Primitives.hs
1063 -- this will not happen unless someone screws with Primitives.hs
824 error "invalid local channel delivery"
1064 error "invalid local channel delivery"
@@ -844,46 +1084,56 @@ ncEffectGetInfo from pid =
844 them = (ProcessIdentifier pid)
1084 them = (ProcessIdentifier pid)
846 node <- ask
1086 node <- ask
847− mProc <- liftIO $
1087+ mProc <- liftIO $ withValidLocalState node
848− withMVar (localState node) $ return . (^. localProcessWithId lpid)
1088+ $ return . (^. localProcessWithId lpid)
849 case mProc of
1089 case mProc of
850 Nothing -> dispatch (isLocal node (ProcessIdentifier from))
1090 Nothing -> dispatch (isLocal node (ProcessIdentifier from))
851− from node (ProcessInfoNone DiedUnknownId)
1091+ from (ProcessInfoNone DiedUnknownId)
852− Just _ -> do
1092+ Just proc -> do
853− itsLinks <- gets (^. linksFor them)
1093+ itsLinks <- Set.map fst . BiMultiMap.lookupBy1st them <$>
854− itsMons <- gets (^. monitorsFor them)
1094+ gets (^. links)
1095+ itsMons <- BiMultiMap.lookupBy1st them <$> gets (^. monitors)
855 registered <- gets (^. registeredHere)
1096 registered <- gets (^. registeredHere)
1097+ size <- liftIO $ queueSize $ processQueue $ proc
857 let reg = registeredNames registered
1099 let reg = registeredNames registered
858 dispatch (isLocal node (ProcessIdentifier from))
1100 dispatch (isLocal node (ProcessIdentifier from))
861 ProcessInfo {
1102 ProcessInfo {
862 infoNode = (processNodeId pid)
1103 infoNode = (processNodeId pid)
863 , infoRegisteredNames = reg
1104 , infoRegisteredNames = reg
864− -- we cannot populate this field
865− , infoMessageQueueLength = Nothing
1105+ , infoMessageQueueLength = size
866− , infoMonitors = Set.toList itsMons
1106+ , infoMonitors = Set.toList itsMons
867− , infoLinks = Set.toList itsLinks
1107+ , infoLinks = Set.toList itsLinks
869− where dispatch :: (Serializable a, Show a)
1109+ where dispatch :: (Serializable a)
871 -> ProcessId
1111 -> ProcessId
874 -> NC ()
1113 -> NC ()
875− dispatch True dest _ pInfo = postAsMessage dest $ pInfo
1114+ dispatch True dest pInfo = postAsMessage dest $ pInfo
876− dispatch False dest node pInfo = do
1115+ dispatch False dest pInfo =
877− liftIO $ sendMessage node
1116+ ncSendToProcess dest $ unsafeCreateUnencodedMessage pInfo
878− (NodeIdentifier (localNodeId node))
879− (ProcessIdentifier dest)
880− WithImplicitReconnect
883 registeredNames = Map.foldlWithKey (\ks k v -> if v == pid
1118 registeredNames = Map.foldlWithKey (\ks k v -> if v == pid
884 then (k:ks)
1119 then (k:ks)
885 else ks) []
1120 else ks) []
1122+ncEffectGetNodeStats :: ProcessId -> NodeId -> NC ()
1123+ncEffectGetNodeStats from _nid = do
1125+ ncState <- StateT.get
1126+ nodeState <- liftIO $ withValidLocalState node return
1129+ nodeStatsNode = localNodeId node
1130+ , nodeStatsRegisteredNames = Map.size $ ncState ^. registeredHere
1131+ , nodeStatsMonitors = BiMultiMap.size $ ncState ^. monitors
1132+ , nodeStatsLinks = BiMultiMap.size $ ncState ^. links
1133+ , nodeStatsProcesses = Map.size (nodeState ^. localProcesses)
1135+ postAsMessage from stats
887--------------------------------------------------------------------------------
1137--------------------------------------------------------------------------------
888-- Auxiliary --
1138-- Auxiliary --
889--------------------------------------------------------------------------------
1139--------------------------------------------------------------------------------
@@ -910,14 +1160,10 @@ notifyDied dest src reason mRef = do
910 throwException dest $ PortLinkException pid reason
1160 throwException dest $ PortLinkException pid reason
911 (False, _, _) ->
1161 (False, _, _) ->
912 -- The change in sender comes from [Unified: Table 10]
1162 -- The change in sender comes from [Unified: Table 10]
913− liftIO $ sendBinary node
914− (NodeIdentifier $ localNodeId node)
915− (NodeIdentifier $ processNodeId dest)
1163+ ncSendToNode (processNodeId dest) $ NCMsg
916− WithImplicitReconnect
918− { ctrlMsgSender = NodeIdentifier (localNodeId node)
1164+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
919− , ctrlMsgSignal = Died src reason
1165+ , ctrlMsgSignal = Died src reason
922-- | [Unified: Table 8]
1168-- | [Unified: Table 8]
923destNid :: ProcessSignal -> Maybe NodeId
1169destNid :: ProcessSignal -> Maybe NodeId
@@ -929,6 +1175,7 @@ destNid (Spawn _ _) = Nothing
929destNid (Register _ _ _ _) = Nothing
1175destNid (Register _ _ _ _) = Nothing
930destNid (WhereIs _) = Nothing
1176destNid (WhereIs _) = Nothing
931destNid (NamedSend _ _) = Nothing
1177destNid (NamedSend _ _) = Nothing
1178+destNid (UnreliableSend _ _) = Nothing
932-- We don't need to forward 'Died' signals; if monitoring/linking is setup,
1179-- We don't need to forward 'Died' signals; if monitoring/linking is setup,
933-- then when a local process dies the monitoring/linking machinery will take
1180-- then when a local process dies the monitoring/linking machinery will take
934-- care of notifying remote nodes
1181-- care of notifying remote nodes
@@ -936,8 +1183,10 @@ destNid (Died _ _) = Nothing
936destNid (Kill pid _) = Just $ processNodeId pid
1183destNid (Kill pid _) = Just $ processNodeId pid
937destNid (Exit pid _) = Just $ processNodeId pid
1184destNid (Exit pid _) = Just $ processNodeId pid
938destNid (GetInfo pid) = Just $ processNodeId pid
1185destNid (GetInfo pid) = Just $ processNodeId pid
1186+destNid (GetNodeStats nid) = Just nid
939destNid (LocalSend pid _) = Just $ processNodeId pid
1187destNid (LocalSend pid _) = Just $ processNodeId pid
940destNid (LocalPortSend cid _) = Just $ processNodeId (sendPortProcessId cid)
1188destNid (LocalPortSend cid _) = Just $ processNodeId (sendPortProcessId cid)
1189+destNid (SigShutdown) = Nothing
942-- | Check if a process is local to our own node
1191-- | Check if a process is local to our own node
943isLocal :: LocalNode -> Identifier -> Bool
1192isLocal :: LocalNode -> Identifier -> Bool
@@ -953,7 +1202,7 @@ unClosure closure = do
953isValidLocalIdentifier :: Identifier -> NC Bool
1202isValidLocalIdentifier :: Identifier -> NC Bool
954isValidLocalIdentifier ident = do
1203isValidLocalIdentifier ident = do
955 node <- ask
1204 node <- ask
956− liftIO . withMVar (localState node) $ \nSt ->
1205+ liftIO . withValidLocalState node $ \nSt ->
957 case ident of
1206 case ident of
958 NodeIdentifier nid ->
1207 NodeIdentifier nid ->
959 return $ nid == localNodeId node
1208 return $ nid == localNodeId node
@@ -978,30 +1227,33 @@ postAsMessage pid = postMessage pid . createUnencodedMessage
979postMessage :: ProcessId -> Message -> NC ()
1228postMessage :: ProcessId -> Message -> NC ()
980postMessage pid msg = do
1229postMessage pid msg = do
981− withLocalProc pid $ \p -> enqueue (processQueue p) msg
1231+ liftIO $ withLocalProc node pid $ \p -> enqueue (processQueue p) msg
983throwException :: Exception e => ProcessId -> e -> NC ()
1233throwException :: Exception e => ProcessId -> e -> NC ()
984−throwException pid e = withLocalProc pid $ \p ->
1234+throwException pid e = do
985− throwTo (processThread p) e
987−withLocalProc :: ProcessId -> (LocalProcess -> IO ()) -> NC ()
988−withLocalProc pid p = do
989 node <- ask
1235 node <- ask
990− liftIO $ do
1236+ -- throwTo blocks until the exception is received by the target thread.
1237+ -- We cannot easily make it happen asynchronpusly because then 'unlink'
1238+ -- semantics would break.
1239+ liftIO $ withLocalProc node pid $ \p -> throwTo (processThread p) e
1241+withLocalProc :: LocalNode -> ProcessId -> (LocalProcess -> IO ()) -> IO ()
1242+withLocalProc node pid p =
991− -- By [Unified: table 6, rule missing_process] messages to dead processes
1243+ -- By [Unified: table 6, rule missing_process] messages to dead processes
992− -- can silently be dropped
1244+ -- can silently be dropped
993− let lpid = processLocalId pid
1245+ let lpid = processLocalId pid in do
1246+ join $ withValidLocalState node $ \vst ->
994− mProc <- withMVar (localState node) $ return . (^. localProcessWithId lpid)
1247+ return $ forM_ (vst ^. localProcessWithId lpid) p
997--------------------------------------------------------------------------------
1249--------------------------------------------------------------------------------
998-- Accessors --
1250-- Accessors --
999--------------------------------------------------------------------------------
1251--------------------------------------------------------------------------------
1001−links :: Accessor NCState (Map Identifier (Set ProcessId))
1253+links :: Accessor NCState (BiMultiMap Identifier ProcessId ())
1002links = accessor _links (\ls st -> st { _links = ls })
1254links = accessor _links (\ls st -> st { _links = ls })
1004−monitors :: Accessor NCState (Map Identifier (Set (ProcessId, MonitorRef)))
1256+monitors :: Accessor NCState (BiMultiMap Identifier ProcessId MonitorRef)
1005monitors = accessor _monitors (\ms st -> st { _monitors = ms })
1257monitors = accessor _monitors (\ms st -> st { _monitors = ms })
1007registeredHere :: Accessor NCState (Map String ProcessId)
1259registeredHere :: Accessor NCState (Map String ProcessId)
@@ -1010,12 +1262,6 @@ registeredHere = accessor _registeredHere (\ry st -> st { _registeredHere = ry }
1010registeredOnNodes :: Accessor NCState (Map ProcessId [(NodeId, Int)])
1262registeredOnNodes :: Accessor NCState (Map ProcessId [(NodeId, Int)])
1011registeredOnNodes = accessor _registeredOnNodes (\ry st -> st { _registeredOnNodes = ry })
1263registeredOnNodes = accessor _registeredOnNodes (\ry st -> st { _registeredOnNodes = ry })
1013−linksFor :: Identifier -> Accessor NCState (Set ProcessId)
1014−linksFor ident = links >>> DAC.mapDefault Set.empty ident
1016−monitorsFor :: Identifier -> Accessor NCState (Set (ProcessId, MonitorRef))
1017−monitorsFor ident = monitors >>> DAC.mapDefault Set.empty ident
1019registeredHereFor :: String -> Accessor NCState (Maybe ProcessId)
1265registeredHereFor :: String -> Accessor NCState (Maybe ProcessId)
1020registeredHereFor ident = registeredHere >>> DAC.mapMaybe ident
1266registeredHereFor ident = registeredHere >>> DAC.mapMaybe ident
@@ -1042,10 +1288,12 @@ registeredOnNodesFor ident = registeredOnNodes >>> DAC.mapMaybe ident
1042-- * the notifications for typed channels to that process.
1288-- * the notifications for typed channels to that process.
1044-- See https://github.com/haskell/containers/issues/14 for the bang on _v.
1290-- See https://github.com/haskell/containers/issues/14 for the bang on _v.
1291+splitNotif :: (Ord a, Ord v)
1045−splitNotif :: Identifier
1292+ => Identifier
1046− -> Map Identifier a
1293+ -> BiMultiMap Identifier a v
1047− -> (Map Identifier a, Map Identifier a)
1294+ -> (Map Identifier (Set (a,v)), BiMultiMap Identifier a v)
1048−splitNotif ident = Map.partitionWithKey (\k !_v -> ident `impliesDeathOf` k)
1295+splitNotif ident =
1296+ BiMultiMap.partitionWithKeyBy1st (\k !_v -> ident `impliesDeathOf` k)
1050--------------------------------------------------------------------------------
1298--------------------------------------------------------------------------------
1051-- Auxiliary --
1299-- Auxiliary --