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