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