@@ -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,67 +23,46 @@ 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_)
60import Data.Maybe (isJust, fromJust, isNothing, catMaybes)
43import Data.Maybe (isJust, fromJust, 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
@@ -103,7 +77,6 @@ import Control.Distributed.Process.Internal.CQueue
103 , enqueue
77 , enqueue
104 , newCQueue
78 , newCQueue
105 , mkWeakCQueue
79 , mkWeakCQueue
108import qualified Network.Transport as NT
81import qualified Network.Transport as NT
109 ( Transport
82 ( Transport
@@ -115,8 +88,8 @@ import qualified Network.Transport as NT
115 , TransportError(..)
88 , TransportError(..)
116 , address
89 , address
117 , closeEndPoint
90 , closeEndPoint
119 , ConnectionId
91 , ConnectionId
121 , EndPointAddress
94 , EndPointAddress
122 , Reliability(ReliableOrdered)
95 , Reliability(ReliableOrdered)
@@ -133,11 +106,8 @@ import Control.Distributed.Process.Internal.Types
133 , LocalProcessId(..)
106 , LocalProcessId(..)
134 , ProcessId(..)
107 , ProcessId(..)
135 , LocalNode(..)
108 , LocalNode(..)
136− , MxEventBus(..)
109+ , Tracer(..)
137 , LocalNodeState(..)
110 , LocalNodeState(..)
138− , ValidLocalNodeState(..)
139− , withValidLocalState
140− , modifyValidLocalState
141 , LocalProcess(..)
111 , LocalProcess(..)
142 , LocalProcessState(..)
112 , LocalProcessState(..)
143 , Process(..)
113 , Process(..)
@@ -147,11 +117,9 @@ import Control.Distributed.Process.Internal.Types
147 , localPidCounter
117 , localPidCounter
148 , localPidUnique
118 , localPidUnique
149 , localProcessWithId
119 , localProcessWithId
151 , localConnections
120 , localConnections
152 , forever'
121 , forever'
153 , MonitorRef(..)
122 , MonitorRef(..)
154− , NodeClosedException(..)
155 , ProcessMonitorNotification(..)
123 , ProcessMonitorNotification(..)
156 , NodeMonitorNotification(..)
124 , NodeMonitorNotification(..)
157 , PortMonitorNotification(..)
125 , PortMonitorNotification(..)
@@ -171,81 +139,58 @@ import Control.Distributed.Process.Internal.Types
172 , ProcessInfo(..)
140 , ProcessInfo(..)
173 , ProcessInfoNone(..)
141 , ProcessInfoNone(..)
175 , SendPortId(..)
142 , SendPortId(..)
176 , typedChannelWithId
143 , typedChannelWithId
177 , RegisterReply(..)
144 , RegisterReply(..)
178 , WhereIsReply(..)
145 , WhereIsReply(..)
179 , payloadToMessage
146 , payloadToMessage
180 , createUnencodedMessage
147 , createUnencodedMessage
181− , unsafeCreateUnencodedMessage
182 , runLocalProcess
148 , runLocalProcess
183 , firstNonReservedProcessId
149 , firstNonReservedProcessId
184 , ImplicitReconnect(WithImplicitReconnect)
150 , ImplicitReconnect(WithImplicitReconnect)
186−import Control.Distributed.Process.Management.Internal.Agent
152+import Control.Distributed.Process.Internal.Trace.Primitives
187− ( mxAgentController
153+ ( traceLogFmt
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
156+import Control.Distributed.Process.Internal.Trace.Types
199 ( TraceArg(..)
157 ( TraceArg(..)
200− , traceEvent
158+ , TraceEvent(..)
202− , enableTrace
160+import Control.Distributed.Process.Internal.Trace.Tracer
204import Control.Distributed.Process.Serializable (Serializable)
164import Control.Distributed.Process.Serializable (Serializable)
205import Control.Distributed.Process.Internal.Messaging
165import Control.Distributed.Process.Internal.Messaging
206 ( sendBinary
166 ( sendBinary
207 , closeImplicitReconnections
168 , closeImplicitReconnections
208 , impliesDeathOf
169 , impliesDeathOf
210import Control.Distributed.Process.Internal.Primitives
171import Control.Distributed.Process.Internal.Primitives
211 ( register
172 ( register
212 , receiveWait
174 , receiveWait
214 , sendChan
176 , sendChan
221−import Control.Distributed.Process.Internal.Types (SendPort, Tracer(..))
178+import Control.Distributed.Process.Internal.Types (SendPort)
222import qualified Control.Distributed.Process.Internal.Closure.BuiltIn as BuiltIn (remoteTable)
179import qualified Control.Distributed.Process.Internal.Closure.BuiltIn as BuiltIn (remoteTable)
223import Control.Distributed.Process.Internal.WeakTQueue (TQueue, writeTQueue)
180import Control.Distributed.Process.Internal.WeakTQueue (TQueue, writeTQueue)
224import qualified Control.Distributed.Process.Internal.StrictContainerAccessors as DAC
181import qualified Control.Distributed.Process.Internal.StrictContainerAccessors as DAC
225 ( mapMaybe
182 ( mapMaybe
226 , mapDefault
183 , mapDefault
228−import Control.Monad.Catch (try)
185+import System.Environment (getEnv)
229−import GHC.IO (IO(..), unsafeUnmask)
230−import GHC.Base ( maskAsyncExceptions# )
232import Unsafe.Coerce
186import 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--------------------------------------------------------------------------------
188--------------------------------------------------------------------------------
244-- Initialization --
189-- Initialization --
245--------------------------------------------------------------------------------
190--------------------------------------------------------------------------------
247initRemoteTable :: RemoteTable
192initRemoteTable :: RemoteTable
248−initRemoteTable = Trace.remoteTable $ BuiltIn.remoteTable Static.initRemoteTable
193+initRemoteTable = BuiltIn.remoteTable Static.initRemoteTable
250-- | Initialize a new local node.
195-- | Initialize a new local node.
251newLocalNode :: NT.Transport -> RemoteTable -> IO LocalNode
196newLocalNode :: NT.Transport -> RemoteTable -> IO LocalNode
@@ -262,7 +207,7 @@ newLocalNode transport rtable = do
262createBareLocalNode :: NT.EndPoint -> RemoteTable -> IO LocalNode
207createBareLocalNode :: NT.EndPoint -> RemoteTable -> IO LocalNode
263createBareLocalNode endPoint rtable = do
208createBareLocalNode endPoint rtable = do
264 unq <- randomIO
209 unq <- randomIO
265− state <- newMVar $ LocalNodeValid $ ValidLocalNodeState
210+ state <- newMVar LocalNodeState
266 { _localProcesses = Map.empty
211 { _localProcesses = Map.empty
267 , _localPidCounter = firstNonReservedProcessId
212 , _localPidCounter = firstNonReservedProcessId
268 , _localPidUnique = unq
213 , _localPidUnique = unq
@@ -273,10 +218,10 @@ createBareLocalNode endPoint rtable = do
273 , localEndPoint = endPoint
218 , localEndPoint = endPoint
274 , localState = state
219 , localState = state
275 , localCtrlChan = ctrlChan
220 , localCtrlChan = ctrlChan
276− , localEventBus = MxEventBusInitialising
221+ , localTracer = InactiveTracer
277 , remoteTable = rtable
222 , remoteTable = rtable
279− tracedNode <- startMxAgent node
224+ tracedNode <- startTracing node
281 -- Once the NC terminates, the endpoint isn't much use,
226 -- Once the NC terminates, the endpoint isn't much use,
282 void $ forkIO $ Exception.finally (runNodeController tracedNode)
227 void $ forkIO $ Exception.finally (runNodeController tracedNode)
@@ -294,27 +239,28 @@ createBareLocalNode endPoint rtable = do
294 , ctrlMsgSignal = SigShutdown
239 , ctrlMsgSignal = SigShutdown
297−startMxAgent :: LocalNode -> IO LocalNode
242+startTracing :: LocalNode -> IO LocalNode
298−startMxAgent node = do
243+startTracing node =
245+ (getEnv "DISTRIBUTED_PROCESS_TRACE_ENABLED" >> procTracer node)
246+ (\(_ :: IOError) -> return node)
247+ where procTracer :: LocalNode -> IO LocalNode
299− -- see note [tracer/forkProcess races]
249+ -- see note [tracer/forkProcess races]
300− let fork = forkProcess node
301− mv <- MVar.newEmptyMVar
250+ mv <- MVar.newEmptyMVar
302− pid <- fork $ mxAgentController fork mv
251+ pid <- forkProcess n (traceController mv)
303− (tracer', wqRef, mxNew') <- MVar.takeMVar mv
252+ wqRef <- MVar.takeMVar mv
304− return node { localEventBus = (MxEventBus pid tracer' wqRef mxNew') }
253+ return n { localTracer = (ActiveTracer pid wqRef) }
306−startDefaultTracer :: LocalNode -> IO ()
255+startDefaultTracer :: LocalNode -> IO (Maybe ProcessId)
307−startDefaultTracer node' = do
256+startDefaultTracer node =
308− let t = localEventBus node'
257+ Exception.catch
309− case t of
258+ (getEnv "DISTRIBUTED_PROCESS_TRACE_ENABLED" >> go node)
310− MxEventBus _ (Tracer pid _) _ _ -> do
259+ (\(_ :: IOError) -> return Nothing)
311− runProcess node' $ register "trace.controller" pid
260+ where go :: LocalNode -> IO (Maybe ProcessId)
312− pid' <- forkProcess node' defaultTracer
262+ pid <- forkProcess node' defaultTracer
313− enableTrace (localEventBus node') pid'
263+ return (Just 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
265-- | Start and register the service processes on a node
320startServiceProcesses :: LocalNode -> IO ()
266startServiceProcesses :: LocalNode -> IO ()
@@ -323,71 +269,51 @@ startServiceProcesses node = do
323 -- the default tracer first, even though it might @nsend@ to the logger
269 -- the default tracer first, even though it might @nsend@ to the logger
324 -- before /that/ process has started - this is a totally harmless race
270 -- before /that/ process has started - this is a totally harmless race
325 -- however, so we deliberably ignore it
271 -- however, so we deliberably ignore it
326− startDefaultTracer node
272+ mPid <- startDefaultTracer node
274+ Nothing -> return ()
276+ runProcess node (register "tracer" pid >> register "tracer.initial" pid)
327 logger <- forkProcess node loop
278 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
279+ runProcess node $ register "logger" logger
335− loop = do
281+ loop = do
336− receiveWait
282+ receiveWait
337− [ match $ \(SayMessage time pid string) -> do
283+ [ match $ \((time, pid, string) ::(String, ProcessId, String)) -> do
338− let time' = formatTime defaultTimeLocale "%c" time
339− liftIO . hPutStrLn stderr $ time' ++ " " ++ show pid ++ ": " ++ string
284+ liftIO . hPutStrLn stderr $ time ++ " " ++ show pid ++ ": " ++ string
341− , match $ \((time, string) :: (String, String)) -> do
286+ , match $ \((time, string) :: (String, String)) -> do
342− -- this is a 'trace' message from the local node tracer
287+ -- this is a 'trace' message from the local node tracer
343− liftIO . hPutStrLn stderr $ time ++ " [trace] " ++ string
288+ liftIO . hPutStrLn stderr $ time ++ " [trace] " ++ string
345− , match $ \(ch :: SendPort ()) -> -- a shutdown request
290+ , match $ \(ch :: SendPort ()) -> -- a shutdown request
346− sendChan ch ()
291+ sendChan ch ()
349−-- | Force-close a local node, killing all processes on that node.
294+-- | Force-close a local node
296+-- TODO: for now we just close the associated endpoint
350closeLocalNode :: LocalNode -> IO ()
297closeLocalNode :: LocalNode -> IO ()
351−closeLocalNode node = do
298+closeLocalNode node =
352− -- Kill processes after refilling the mvar. Otherwise, there is potential for
299+ -- TODO: close all our processes, surely!?
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)
300 NT.closeEndPoint (localEndPoint node)
370-- | Run a process on a local node and wait for it to finish
302-- | Run a process on a local node and wait for it to finish
371runProcess :: LocalNode -> Process () -> IO ()
303runProcess :: LocalNode -> Process () -> IO ()
372runProcess node proc = do
304runProcess node proc = do
373 done <- newEmptyMVar
305 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
306+ void $ forkProcess node (proc `finally` liftIO (putMVar done ()))
377− takeMVar done >>= either (throwIO :: SomeException -> IO a) return
307+ takeMVar done
379-- | Spawn a new process on a local node
309-- | Spawn a new process on a local node
380forkProcess :: LocalNode -> Process () -> IO ProcessId
310forkProcess :: LocalNode -> Process () -> IO ProcessId
381−forkProcess node proc = do
382− ms <- getMaskingState
383− modifyMVarMasked (localState node) (startProcess ms)
311+forkProcess node proc = modifyMVar (localState node) startProcess
385− startProcess :: MaskingState
387− -> IO (LocalNodeState, ProcessId)
313+ startProcess :: LocalNodeState -> IO (LocalNodeState, ProcessId)
388− startProcess ms (LocalNodeValid vst) = do
314+ startProcess st = do
389− let lpid = LocalProcessId { lpidCounter = vst ^. localPidCounter
315+ let lpid = LocalProcessId { lpidCounter = st ^. localPidCounter
390− , lpidUnique = vst ^. localPidUnique
316+ , lpidUnique = st ^. localPidUnique
392 let pid = ProcessId { processNodeId = localNodeId node
318 let pid = ProcessId { processNodeId = localNodeId node
393 , processLocalId = lpid
319 , processLocalId = lpid
@@ -407,78 +333,53 @@ forkProcess node proc = do
407 , processThread = tid
333 , processThread = tid
408 , processNode = node
334 , 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
336+ tid' <- forkIO $ do
417− reason <- Exception.catches
337+ reason <- Exception.catch
418− (unmask $ runLocalProcess lproc proc >> return DiedNormal)
338+ (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)))]
339+ (return . DiedException . (show :: SomeException -> String))
427 -- [Unified: Table 4, rules termination and exiting]
341 -- [Unified: Table 4, rules termination and exiting]
428− mconns <- modifyValidLocalState node (cleanupProcess pid)
342+ 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
343 writeChan (localCtrlChan node) NCMsg
435 { ctrlMsgSender = ProcessIdentifier pid
344 { ctrlMsgSender = ProcessIdentifier pid
436 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason
345 , ctrlMsgSignal = Died (ProcessIdentifier pid) reason
438 return (tid', lproc)
347 return (tid', lproc)
440 -- see note [tracer/forkProcess races]
350 -- see note [tracer/forkProcess races]
441− trace node (MxSpawned pid)
351+ trace node (TraceEvSpawned pid)
443 if lpidCounter lpid == maxBound
353 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
355 newUnique <- randomIO
448− return ( LocalNodeValid
449− $ (localProcessWithId lpid ^= Just lproc)
356+ return ( (localProcessWithId lpid ^= Just lproc)
450 . (localPidCounter ^= firstNonReservedProcessId)
357 . (localPidCounter ^= firstNonReservedProcessId)
451 . (localPidUnique ^= newUnique)
358 . (localPidUnique ^= newUnique)
456− return ( LocalNodeValid
457− $ (localProcessWithId lpid ^= Just lproc)
363+ return ( (localProcessWithId lpid ^= Just lproc)
458 . (localPidCounter ^: (+ 1))
364 . (localPidCounter ^: (+ 1))
462− startProcess _ LocalNodeClosed =
463− throwIO $ NodeClosedException $ localNodeId node
465− cleanupProcess :: ProcessId
369+ cleanupProcess :: ProcessId -> LocalNodeState -> IO LocalNodeState
466− -> ValidLocalNodeState
467− -> IO (ValidLocalNodeState, [NT.Connection])
468− cleanupProcess pid vst = do
370+ cleanupProcess pid st = do
469 let pid' = ProcessIdentifier pid
371 let pid' = ProcessIdentifier pid
470− let (affected, unaffected) = Map.partitionWithKey (\(fr, _to) !_v -> impliesDeathOf pid' fr) (vst ^. localConnections)
372+ let (affected, unaffected) = Map.partitionWithKey (\(fr, _to) !_v -> impliesDeathOf pid' fr) (st ^. localConnections)
373+ mapM_ (NT.close . fst) (Map.elems affected)
471− return ( (localProcessWithId (processLocalId pid) ^= Nothing)
374+ return $ (localProcessWithId (processLocalId pid) ^= Nothing)
472− . (localConnections ^= unaffected)
375+ . (localConnections ^= unaffected)
474− , map fst $ Map.elems affected
477-- note [tracer/forkProcess races]
378-- note [tracer/forkProcess races]
479-- Our startTracing function uses forkProcess to start the trace controller
380-- Our startTracing function uses forkProcess to start the trace controller
480-- process, and of course forkProcess attempts to call traceEvent once the
381-- process, and of course forkProcess attempts to call traceEvent once the
481−-- process has started. This is harmless, as the localEventBus is not updated
382+-- process has started. This is harmless, as the localTracer is not updated
482-- until /after/ the initial forkProcess completes, so the first call to
383-- until /after/ the initial forkProcess completes, so the first call to
483-- traceEvent behaves as if tracing were disabled (i.e., it is ignored).
384-- traceEvent behaves as if tracing were disabled (i.e., it is ignored).
@@ -492,7 +393,7 @@ type IncomingConnection = (NT.EndPointAddress, IncomingTarget)
492data IncomingTarget =
393data IncomingTarget =
494 | ToProc ProcessId (Weak (CQueue Message))
395 | ToProc ProcessId (Weak (CQueue Message))
495− | ToChan SendPortId TypedChannel
396+ | ToChan TypedChannel
498data ConnectionState = ConnectionState {
399data ConnectionState = ConnectionState {
@@ -519,7 +420,6 @@ incomingFrom addr = aux >>> DAC.mapDefault Set.empty addr
520handleIncomingMessages :: LocalNode -> IO ()
421handleIncomingMessages :: LocalNode -> IO ()
521handleIncomingMessages node = go initConnectionState
422handleIncomingMessages node = go initConnectionState
522− `Exception.catch` \(NodeClosedException _) -> return ()
524 go :: ConnectionState -> IO ()
424 go :: ConnectionState -> IO ()
525 go !st = do
425 go !st = do
@@ -528,14 +428,13 @@ handleIncomingMessages node = go initConnectionState
528 NT.ConnectionOpened cid rel theirAddr ->
428 NT.ConnectionOpened cid rel theirAddr ->
529 if rel == NT.ReliableOrdered
429 if rel == NT.ReliableOrdered
531− trace node (MxConnected cid theirAddr)
431+ trace node (TraceEvConnected cid)
533 (incomingAt cid ^= Just (theirAddr, Uninit))
433 (incomingAt cid ^= Just (theirAddr, Uninit))
534 . (incomingFrom theirAddr ^: Set.insert cid)
434 . (incomingFrom theirAddr ^: Set.insert cid)
537− else invalidRequest cid st $
437+ else invalidRequest cid st
538− "attempt to connect with unsupported reliability " ++ show rel
539 NT.Received cid payload ->
438 NT.Received cid payload ->
540 case st ^. incomingAt cid of
439 case st ^. incomingAt cid of
541 Just (_, ToProc pid weakQueue) -> do
440 Just (_, ToProc pid weakQueue) -> do
@@ -545,19 +444,15 @@ handleIncomingMessages node = go initConnectionState
545 -- it from the NC state? (and same for channels, below)
444 -- it from the NC state? (and same for channels, below)
546 let msg = payloadToMessage payload
445 let msg = payloadToMessage payload
547 enqueue queue msg -- 'enqueue' is strict
446 enqueue queue msg -- 'enqueue' is strict
548− trace node (MxReceived pid msg)
447+ trace node (TraceEvReceived pid msg)
550− Just (_, ToChan chId (TypedChannel chan')) -> do
449+ Just (_, ToChan (TypedChannel chan')) -> do
551 mChan <- deRefWeak chan'
450 mChan <- deRefWeak chan'
552 -- If mChan is Nothing, the process has given up the read end of
451 -- If mChan is Nothing, the process has given up the read end of
553 -- the channel and we simply ignore the incoming message
452 -- the channel and we simply ignore the incoming message
554− forM_ mChan $ \chan -> do
453+ 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
454+ -- We make sure the message is fully decoded when it is enqueued
558− writeTQueue chan msg
455+ writeTQueue chan $! decode (BSL.fromChunks payload)
560− trace node $ MxReceivedPort chId $ unsafeCreateUnencodedMessage msg'
562 Just (_, ToNode) -> do
457 Just (_, ToNode) -> do
563 let ctrlMsg = decode . BSL.fromChunks $ payload
458 let ctrlMsg = decode . BSL.fromChunks $ payload
@@ -567,49 +462,38 @@ handleIncomingMessages node = go initConnectionState
567 case decode (BSL.fromChunks payload) of
462 case decode (BSL.fromChunks payload) of
568 ProcessIdentifier pid -> do
463 ProcessIdentifier pid -> do
569 let lpid = processLocalId pid
464 let lpid = processLocalId pid
570− mProc <- withValidLocalState node $ return . (^. localProcessWithId lpid)
465+ mProc <- withMVar state $ return . (^. localProcessWithId lpid)
571 case mProc of
466 case mProc of
572 Just proc ->
467 Just proc ->
573 go (incomingAt cid ^= Just (src, ToProc pid (processWeakQ proc)) $ st)
468 go (incomingAt cid ^= Just (src, ToProc pid (processWeakQ proc)) $ st)
574 Nothing ->
469 Nothing ->
575− -- incoming attempt to connect to unknown process - might
470+ invalidRequest cid st
577− go (incomingAt cid ^= Nothing $ st)
578 SendPortIdentifier chId -> do
471 SendPortIdentifier chId -> do
579 let lcid = sendPortLocalId chId
472 let lcid = sendPortLocalId chId
580 lpid = processLocalId (sendPortProcessId chId)
473 lpid = processLocalId (sendPortProcessId chId)
581− mProc <- withValidLocalState node $ return . (^. localProcessWithId lpid)
474+ mProc <- withMVar state $ return . (^. localProcessWithId lpid)
582 case mProc of
475 case mProc of
583 Just proc -> do
476 Just proc -> do
584 mChannel <- withMVar (processState proc) $ return . (^. typedChannelWithId lcid)
477 mChannel <- withMVar (processState proc) $ return . (^. typedChannelWithId lcid)
585 case mChannel of
478 case mChannel of
586 Just channel ->
479 Just channel ->
587− go (incomingAt cid ^= Just (src, ToChan chId channel) $ st)
480+ go (incomingAt cid ^= Just (src, ToChan channel) $ st)
588 Nothing ->
481 Nothing ->
589− invalidRequest cid st $
482+ invalidRequest cid st
590− "incoming attempt to connect to unknown channel of"
591− ++ " process " ++ show (sendPortProcessId chId)
592 Nothing ->
483 Nothing ->
593− -- incoming attempt to connect to channel of unknown
484+ invalidRequest cid st
594− -- process - might be dead already
595− go (incomingAt cid ^= Nothing $ st)
596 NodeIdentifier nid ->
485 NodeIdentifier nid ->
597 if nid == localNodeId node
486 if nid == localNodeId node
598 then go (incomingAt cid ^= Just (src, ToNode) $ st)
487 then go (incomingAt cid ^= Just (src, ToNode) $ st)
599− else invalidRequest cid st $
488+ 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 ->
489 Nothing ->
605 invalidRequest cid st
490 invalidRequest cid st
606− "message received from an unknown connection"
607 NT.ConnectionClosed cid ->
491 NT.ConnectionClosed cid ->
608 case st ^. incomingAt cid of
492 case st ^. incomingAt cid of
609 Nothing ->
493 Nothing ->
610− invalidRequest cid st "closed unknown connection"
494+ invalidRequest cid st
611 Just (src, _) -> do
495 Just (src, _) -> do
612− trace node (MxDisconnected cid src)
496+ trace node (TraceEvDisconnected cid)
613 go ( (incomingAt cid ^= Nothing)
497 go ( (incomingAt cid ^= Nothing)
614 . (incomingFrom src ^: Set.delete cid)
498 . (incomingFrom src ^: Set.delete cid)
@@ -638,20 +522,19 @@ handleIncomingMessages node = go initConnectionState
638 -- and we just give up
522 -- and we just give up
639 fail "Cloud Haskell fatal error: received unexpected multicast"
523 fail "Cloud Haskell fatal error: received unexpected multicast"
641− invalidRequest :: NT.ConnectionId -> ConnectionState -> String -> IO ()
525+ invalidRequest :: NT.ConnectionId -> ConnectionState -> IO ()
642− invalidRequest cid st msg = do
526+ invalidRequest cid st = do
643 -- TODO: We should treat this as a fatal error on the part of the remote
527 -- 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
528 -- node. That is, we should report the remote node as having died, and we
645 -- should close incoming connections (this requires a Transport layer
529 -- should close incoming connections (this requires a Transport layer
646 -- extension).
530 -- extension).
647− traceEventFmtIO node "" [ TraceStr $ " [network] invalid request"
531+ traceEventFmtIO node "" [(TraceStr " [network] invalid request: "),
648− ++ " (" ++ msg ++ "): "
649− , (Trace cid)
532+ (Trace cid)]
651 go ( incomingAt cid ^= Nothing
533 go ( incomingAt cid ^= Nothing
537+ state = localState node
655 endpoint = localEndPoint node
538 endpoint = localEndPoint node
656 ctrlChan = localCtrlChan node
539 ctrlChan = localCtrlChan node
@@ -660,9 +543,8 @@ handleIncomingMessages node = go initConnectionState
660--------------------------------------------------------------------------------
543--------------------------------------------------------------------------------
662runNodeController :: LocalNode -> IO ()
545runNodeController :: LocalNode -> IO ()
663−runNodeController node =
546+runNodeController =
664− runReaderT (evalStateT (unNC nodeController) initNCState) node
547+ runReaderT (evalStateT (unNC nodeController) initNCState)
665− `Exception.catch` \(NodeClosedException _) -> return ()
667--------------------------------------------------------------------------------
549--------------------------------------------------------------------------------
668-- Internal data types --
550-- Internal data types --
@@ -670,26 +552,20 @@ runNodeController node =
671data NCState = NCState
553data NCState = NCState
672 { -- Mapping from remote processes to linked local processes
554 { -- Mapping from remote processes to linked local processes
673− _links :: !(BiMultiMap Identifier ProcessId ())
555+ _links :: !(Map Identifier (Set ProcessId))
674 -- Mapping from remote processes to monitoring local processes
556 -- Mapping from remote processes to monitoring local processes
675− , _monitors :: !(BiMultiMap Identifier ProcessId MonitorRef)
557+ , _monitors :: !(Map Identifier (Set (ProcessId, MonitorRef)))
676 -- Process registry: names and where they live, mapped to the PIDs
558 -- Process registry: names and where they live, mapped to the PIDs
677 , _registeredHere :: !(Map String ProcessId)
559 , _registeredHere :: !(Map String ProcessId)
678 , _registeredOnNodes :: !(Map ProcessId [(NodeId,Int)])
560 , _registeredOnNodes :: !(Map ProcessId [(NodeId,Int)])
681newtype NC a = NC { unNC :: StateT NCState (ReaderT LocalNode IO) a }
563newtype NC a = NC { unNC :: StateT NCState (ReaderT LocalNode IO) a }
682− deriving ( Applicative
686− , MonadState NCState
687− , MonadReader LocalNode
564+ deriving (Functor, Monad, MonadIO, MonadState NCState, MonadReader LocalNode)
690initNCState :: NCState
566initNCState :: NCState
691−initNCState = NCState { _links = BiMultiMap.empty
567+initNCState = NCState { _links = Map.empty
692− , _monitors = BiMultiMap.empty
568+ , _monitors = Map.empty
693 , _registeredHere = Map.empty
569 , _registeredHere = Map.empty
694 , _registeredOnNodes = Map.empty
570 , _registeredOnNodes = Map.empty
@@ -705,46 +581,19 @@ instance Show ProcessKillException where
705 show (ProcessKillException pid reason) =
581 show (ProcessKillException pid reason) =
706 "killed-by=" ++ show pid ++ ",reason=" ++ reason
582 "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--------------------------------------------------------------------------------
584--------------------------------------------------------------------------------
736-- Tracing/Debugging --
585-- Tracing/Debugging --
737--------------------------------------------------------------------------------
586--------------------------------------------------------------------------------
739−-- [Issue #104 / DP-13]
588+-- [Issue #104]
741traceNotifyDied :: LocalNode -> Identifier -> DiedReason -> NC ()
590traceNotifyDied :: LocalNode -> Identifier -> DiedReason -> NC ()
742traceNotifyDied node ident reason =
591traceNotifyDied node ident reason =
743 -- TODO: sendPortDied notifications
592 -- TODO: sendPortDied notifications
744 liftIO $ withLocalTracer node $ \t ->
593 liftIO $ withLocalTracer node $ \t ->
745 case ident of
594 case ident of
746− (NodeIdentifier nid) -> traceEvent t (MxNodeDied nid reason)
595+ (NodeIdentifier nid) -> traceEvent t (TraceEvNodeDied nid reason)
747− (ProcessIdentifier pid) -> traceEvent t (MxProcessDied pid reason)
596+ (ProcessIdentifier pid) -> traceEvent t (TraceEvDied pid reason)
748 _ -> return ()
597 _ -> return ()
750traceEventFmtIO :: LocalNode
599traceEventFmtIO :: LocalNode
@@ -754,11 +603,11 @@ traceEventFmtIO :: LocalNode
754traceEventFmtIO node fmt args =
603traceEventFmtIO node fmt args =
755 withLocalTracer node $ \t -> traceLogFmt t fmt args
604 withLocalTracer node $ \t -> traceLogFmt t fmt args
757−trace :: LocalNode -> MxEvent -> IO ()
606+trace :: LocalNode -> TraceEvent -> IO ()
758trace node ev = withLocalTracer node $ \t -> traceEvent t ev
607trace node ev = withLocalTracer node $ \t -> traceEvent t ev
760−withLocalTracer :: LocalNode -> (MxEventBus -> IO ()) -> IO ()
609+withLocalTracer :: LocalNode -> (Tracer -> IO ()) -> IO ()
761−withLocalTracer node act = act (localEventBus node)
610+withLocalTracer node act = act (localTracer node)
763--------------------------------------------------------------------------------
612--------------------------------------------------------------------------------
764-- Core functionality --
613-- Core functionality --
@@ -774,7 +623,11 @@ nodeController = do
774 -- [Unified: Table 7, rule nc_forward]
623 -- [Unified: Table 7, rule nc_forward]
775 case destNid (ctrlMsgSignal msg) of
624 case destNid (ctrlMsgSignal msg) of
776 Just nid' | nid' /= localNodeId node ->
625 Just nid' | nid' /= localNodeId node ->
777− ncSendToNode nid' msg
626+ liftIO $ sendBinary node
628+ (NodeIdentifier nid')
629+ WithImplicitReconnect
779 return ()
632 return ()
@@ -797,8 +650,6 @@ nodeController = do
797 ncEffectWhereIs from label
650 ncEffectWhereIs from label
798 NCMsg _ (NamedSend label msg') ->
651 NCMsg _ (NamedSend label msg') ->
799 ncEffectNamedSend label msg'
652 ncEffectNamedSend label msg'
800− NCMsg _ (UnreliableSend lpid msg') ->
801− ncEffectLocalSend node (ProcessId (localNodeId node) lpid) msg'
802 NCMsg _ (LocalSend to msg') ->
653 NCMsg _ (LocalSend to msg') ->
803 ncEffectLocalSend node to msg'
654 ncEffectLocalSend node to msg'
804 NCMsg _ (LocalPortSend to msg') ->
655 NCMsg _ (LocalPortSend to msg') ->
@@ -812,9 +663,8 @@ nodeController = do
812 NCMsg _ SigShutdown ->
663 NCMsg _ SigShutdown ->
813 liftIO $ do
664 liftIO $ do
814 NT.closeEndPoint (localEndPoint node)
665 NT.closeEndPoint (localEndPoint node)
815− `Exception.finally` throwIO (NodeClosedException $ localNodeId node)
666+ `Exception.finally` throwIO ThreadKilled
816− NCMsg (ProcessIdentifier from) (GetNodeStats nid) ->
667+ -- ThreadKilled seems to make more sense than fail/error here
817− ncEffectGetNodeStats from nid
818 unexpected ->
668 unexpected ->
819 error $ "nodeController: unexpected message " ++ show unexpected
669 error $ "nodeController: unexpected message " ++ show unexpected
@@ -832,18 +682,22 @@ ncEffectMonitor from them mRef = do
832 case (shouldLink, isLocal node (ProcessIdentifier from)) of
682 case (shouldLink, isLocal node (ProcessIdentifier from)) of
833 (True, _) -> -- [Unified: first rule]
683 (True, _) -> -- [Unified: first rule]
834 case mRef of
684 case mRef of
835− Just ref -> modify' $ monitors ^: BiMultiMap.insert them from ref
685+ Just ref -> modify' $ monitorsFor them ^: Set.insert (from, ref)
836− Nothing -> modify' $ links ^: BiMultiMap.insert them from ()
686+ Nothing -> modify' $ linksFor them ^: Set.insert from
837 (False, True) -> -- [Unified: second rule]
687 (False, True) -> -- [Unified: second rule]
838 notifyDied from them DiedUnknownId mRef
688 notifyDied from them DiedUnknownId mRef
839 (False, False) -> -- [Unified: third rule]
689 (False, False) -> -- [Unified: third rule]
840 -- TODO: this is the right sender according to the Unified semantics,
690 -- TODO: this is the right sender according to the Unified semantics,
841 -- but perhaps having 'them' as the sender would make more sense
691 -- but perhaps having 'them' as the sender would make more sense
842 -- (see also: notifyDied)
692 -- (see also: notifyDied)
693+ liftIO $ sendBinary node
694+ (NodeIdentifier $ localNodeId node)
843− ncSendToNode (processNodeId from) $ NCMsg
695+ (NodeIdentifier $ processNodeId from)
696+ WithImplicitReconnect
844− { ctrlMsgSender = NodeIdentifier (localNodeId node)
698+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
845− , ctrlMsgSignal = Died them DiedUnknownId
699+ , ctrlMsgSignal = Died them DiedUnknownId
848-- [Unified: Table 11]
702-- [Unified: Table 11]
849ncEffectUnlink :: ProcessId -> Identifier -> NC ()
703ncEffectUnlink :: ProcessId -> Identifier -> NC ()
@@ -857,7 +711,7 @@ ncEffectUnlink from them = do
857 postAsMessage from $ DidUnlinkNode nid
711 postAsMessage from $ DidUnlinkNode nid
858 SendPortIdentifier cid ->
712 SendPortIdentifier cid ->
859 postAsMessage from $ DidUnlinkPort cid
713 postAsMessage from $ DidUnlinkPort cid
860− modify' $ links ^: BiMultiMap.delete them from ()
714+ modify' $ linksFor them ^: Set.delete from
862-- [Unified: Table 11]
716-- [Unified: Table 11]
863ncEffectUnmonitor :: ProcessId -> MonitorRef -> NC ()
717ncEffectUnmonitor :: ProcessId -> MonitorRef -> NC ()
@@ -865,7 +719,7 @@ ncEffectUnmonitor from ref = do
865 node <- ask
719 node <- ask
866 when (isLocal node (ProcessIdentifier from)) $
720 when (isLocal node (ProcessIdentifier from)) $
867 postAsMessage from $ DidUnmonitor ref
721 postAsMessage from $ DidUnmonitor ref
868− modify' $ monitors ^: BiMultiMap.delete (monitorRefIdent ref) from ref
722+ modify' $ monitorsFor (monitorRefIdent ref) ^: Set.delete (from, ref)
870-- [Unified: Table 12]
724-- [Unified: Table 12]
871ncEffectDied :: Identifier -> DiedReason -> NC ()
725ncEffectDied :: Identifier -> DiedReason -> NC ()
@@ -880,7 +734,7 @@ ncEffectDied ident reason = do
880 let localOnly = case ident of NodeIdentifier _ -> True ; _ -> False
734 let localOnly = case ident of NodeIdentifier _ -> True ; _ -> False
882 forM_ (Map.toList affectedLinks) $ \(them, uss) ->
736 forM_ (Map.toList affectedLinks) $ \(them, uss) ->
883− forM_ uss $ \(us, _) ->
737+ forM_ uss $ \us ->
884 when (localOnly <= isLocal node (ProcessIdentifier us)) $
738 when (localOnly <= isLocal node (ProcessIdentifier us)) $
885 notifyDied us them reason Nothing
739 notifyDied us them reason Nothing
@@ -889,35 +743,9 @@ ncEffectDied ident reason = do
889 when (localOnly <= isLocal node (ProcessIdentifier us)) $
743 when (localOnly <= isLocal node (ProcessIdentifier us)) $
890 notifyDied us them reason (Just ref)
744 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')
746+ modify' $ (links ^= unaffectedLinks) . (monitors ^= unaffectedMons)
916− -- we now consider all labels for this identifier unregistered
917− let toDrop pid = not $ ident `impliesDeathOf` ProcessIdentifier pid
748+ 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)) >>=
750 remaining <- fmap Map.toList (gets (^. registeredOnNodes)) >>=
923 mapM (\(pid,nidlist) ->
751 mapM (\(pid,nidlist) ->
@@ -925,15 +753,20 @@ ncEffectDied ident reason = do
926 do forM_ nidlist $ \(nid,_) ->
754 do forM_ nidlist $ \(nid,_) ->
927 when (not $ isLocal node (NodeIdentifier nid))
755 when (not $ isLocal node (NodeIdentifier nid))
928− (forwardDeath node nid)
756+ (forwardNameDeath node nid)
929 return Nothing
757 return Nothing
930 False -> return $ Just (pid,nidlist) )
758 False -> return $ Just (pid,nidlist) )
931 modify' $ registeredOnNodes ^= (Map.fromList (catMaybes remaining))
759 modify' $ registeredOnNodes ^= (Map.fromList (catMaybes remaining))
933− forwardDeath node nid = ncSendToNode nid
761+ forwardNameDeath node nid =
762+ liftIO $ sendBinary node
763+ (NodeIdentifier $ localNodeId node)
764+ (NodeIdentifier $ nid)
765+ WithImplicitReconnect
934− NCMsg { ctrlMsgSender = NodeIdentifier (localNodeId node)
767+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
935− , ctrlMsgSignal = Died ident reason
768+ , ctrlMsgSignal = Died ident reason
938-- [Unified: Table 13]
771-- [Unified: Table 13]
939ncEffectSpawn :: ProcessId -> Closure (Process ()) -> SpawnRef -> NC ()
772ncEffectSpawn :: ProcessId -> Closure (Process ()) -> SpawnRef -> NC ()
@@ -941,13 +774,17 @@ ncEffectSpawn pid cProc ref = do
941 mProc <- unClosure cProc
774 mProc <- unClosure cProc
942 -- If the closure does not exist, we spawn a process that throws an exception
775 -- 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
776 -- This allows the remote node to find out what's happening
944− -- TODO:
777+ -- TODO:
945 let proc = case mProc of
778 let proc = case mProc of
946 Left err -> fail $ "Error: Could not resolve closure: " ++ err
779 Left err -> fail $ "Error: Could not resolve closure: " ++ err
947 Right p -> p
780 Right p -> p
948 node <- ask
781 node <- ask
949 pid' <- liftIO $ forkProcess node proc
782 pid' <- liftIO $ forkProcess node proc
950− ncSendToProcess pid $ unsafeCreateUnencodedMessage $ DidSpawn ref pid'
783+ liftIO $ sendMessage node
784+ (NodeIdentifier (localNodeId node))
785+ (ProcessIdentifier pid)
786+ WithImplicitReconnect
952-- Unified semantics does not explicitly describe how to implement 'register',
789-- Unified semantics does not explicitly describe how to implement 'register',
953-- but mentions it's "very similar to nsend" (Table 14)
790-- but mentions it's "very similar to nsend" (Table 14)
@@ -965,19 +802,17 @@ ncEffectRegister from label atnode mPid reregistration = do
965 return $ (isNothing currentVal /= reregistration) &&
802 return $ (isNothing currentVal /= reregistration) &&
966 (not (isLocal node (ProcessIdentifier thepid) ) || isvalidlocal )
803 (not (isLocal node (ProcessIdentifier thepid) ) || isvalidlocal )
967 if isLocal node (NodeIdentifier atnode)
804 if isLocal node (NodeIdentifier atnode)
968− then do when isOk $
805+ then do when (isOk) $
969 do modify' $ registeredHereFor label ^= mPid
806 do modify' $ registeredHereFor label ^= mPid
970 updateRemote node currentVal mPid
807 updateRemote node currentVal mPid
971 case mPid of
808 case mPid of
972− (Just p) -> do
809+ (Just p) -> liftIO $ trace node (TraceEvRegistered p label)
974− then liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
976− liftIO $ trace node (MxRegistered p label)
977− Nothing -> liftIO $ trace node (MxUnRegistered (fromJust currentVal) label)
810+ Nothing -> liftIO $ trace node (TraceEvUnRegistered (fromJust currentVal) label)
978− newVal <- gets (^. registeredHereFor label)
811+ liftIO $ sendMessage node
979− ncSendToProcess from $ unsafeCreateUnencodedMessage $
812+ (NodeIdentifier (localNodeId node))
813+ (ProcessIdentifier from)
814+ WithImplicitReconnect
980− RegisterReply label isOk newVal
815+ (RegisterReply label isOk)
981 else let operation =
816 else let operation =
982 case reregistration of
817 case reregistration of
983 True -> flip decList
818 True -> flip decList
@@ -1007,36 +842,40 @@ ncEffectRegister from label atnode mPid reregistration = do
1007 decList (x:xs) tag = x:decList xs tag
842 decList (x:xs) tag = x:decList xs tag
1008 forward node to reg =
843 forward node to reg =
1009 when (not $ isLocal node (NodeIdentifier to)) $
844 when (not $ isLocal node (NodeIdentifier to)) $
845+ liftIO $ sendBinary node
846+ (ProcessIdentifier from)
848+ WithImplicitReconnect
1010− ncSendToNode to $ NCMsg { ctrlMsgSender = ProcessIdentifier from
850+ { ctrlMsgSender = ProcessIdentifier from
1011− , ctrlMsgSignal = reg
851+ , ctrlMsgSignal = reg
1015-- Unified semantics does not explicitly describe 'whereis'
855-- Unified semantics does not explicitly describe 'whereis'
1016ncEffectWhereIs :: ProcessId -> String -> NC ()
856ncEffectWhereIs :: ProcessId -> String -> NC ()
1017ncEffectWhereIs from label = do
857ncEffectWhereIs from label = do
1018 mPid <- gets (^. registeredHereFor label)
859 mPid <- gets (^. registeredHereFor label)
860+ liftIO $ sendMessage node
861+ (NodeIdentifier (localNodeId node))
862+ (ProcessIdentifier from)
863+ WithImplicitReconnect
1019− ncSendToProcess from $ unsafeCreateUnencodedMessage $ WhereIsReply label mPid
864+ (WhereIsReply label mPid)
1021-- [Unified: Table 14]
866-- [Unified: Table 14]
1022ncEffectNamedSend :: String -> Message -> NC ()
867ncEffectNamedSend :: String -> Message -> NC ()
1023ncEffectNamedSend label msg = do
868ncEffectNamedSend label msg = do
1024 mPid <- gets (^. registeredHereFor label)
869 mPid <- gets (^. registeredHereFor label)
1025 -- If mPid is Nothing, we just ignore the named send (as per Table 14)
870 -- If mPid is Nothing, we just ignore the named send (as per Table 14)
1026− forM_ mPid $ \to ->
871+ 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]
873-- [Issue #DP-20]
1032ncEffectLocalSend :: LocalNode -> ProcessId -> Message -> NC ()
874ncEffectLocalSend :: LocalNode -> ProcessId -> Message -> NC ()
1033−ncEffectLocalSend = ncEffectLocalSendAndTrace True
875+ncEffectLocalSend node to msg =
1035−ncEffectLocalSendAndTrace :: Bool -> LocalNode -> ProcessId -> Message -> NC ()
1036−ncEffectLocalSendAndTrace shouldTrace node to msg =
1037 liftIO $ withLocalProc node to $ \p -> do
876 liftIO $ withLocalProc node to $ \p -> do
1038 enqueue (processQueue p) msg
877 enqueue (processQueue p) msg
1039− when shouldTrace $ trace node (MxReceived to msg)
878+ trace node (TraceEvReceived to msg)
1041-- [Issue #DP-20]
880-- [Issue #DP-20]
1042ncEffectLocalPortSend :: SendPortId -> Message -> NC ()
881ncEffectLocalPortSend :: SendPortId -> Message -> NC ()
@@ -1054,12 +893,11 @@ ncEffectLocalPortSend from msg = do
1054 -- If ch is Nothing, the process has given up the read end of
893 -- If ch is Nothing, the process has given up the read end of
1055 -- the channel and we simply ignore the incoming message - this
894 -- the channel and we simply ignore the incoming message - this
1056 ch <- deRefWeak chan'
895 ch <- deRefWeak chan'
1057− forM_ ch $ \chan -> deliverChan node from msg chan
896+ forM_ ch $ \chan -> deliverChan msg chan
1058− where deliverChan :: forall a . LocalNode -> SendPortId -> Message -> TQueue a -> IO ()
897+ where deliverChan :: forall a . Message -> TQueue a -> IO ()
1059− deliverChan n p (UnencodedMessage _ raw) chan' = do
898+ deliverChan (UnencodedMessage _ raw) chan' =
1060 atomically $ writeTQueue chan' ((unsafeCoerce raw) :: a)
899 atomically $ writeTQueue chan' ((unsafeCoerce raw) :: a)
1061− trace n (MxReceivedPort p $ unsafeCreateUnencodedMessage raw)
1062− deliverChan _ _ (EncodedMessage _ _) _ =
900+ deliverChan (EncodedMessage _ _) _ =
1063 -- this will not happen unless someone screws with Primitives.hs
901 -- this will not happen unless someone screws with Primitives.hs
1064 error "invalid local channel delivery"
902 error "invalid local channel delivery"
@@ -1084,56 +922,46 @@ ncEffectGetInfo from pid =
1084 them = (ProcessIdentifier pid)
922 them = (ProcessIdentifier pid)
1086 node <- ask
924 node <- ask
1087− mProc <- liftIO $ withValidLocalState node
925+ mProc <- liftIO $
1088− $ return . (^. localProcessWithId lpid)
926+ withMVar (localState node) $ return . (^. localProcessWithId lpid)
1089 case mProc of
927 case mProc of
1090 Nothing -> dispatch (isLocal node (ProcessIdentifier from))
928 Nothing -> dispatch (isLocal node (ProcessIdentifier from))
1091− from (ProcessInfoNone DiedUnknownId)
929+ from node (ProcessInfoNone DiedUnknownId)
1092− Just proc -> do
930+ Just _ -> do
1093− itsLinks <- Set.map fst . BiMultiMap.lookupBy1st them <$>
931+ itsLinks <- gets (^. linksFor them)
1094− gets (^. links)
932+ itsMons <- gets (^. monitorsFor them)
1095− itsMons <- BiMultiMap.lookupBy1st them <$> gets (^. monitors)
1096 registered <- gets (^. registeredHere)
933 registered <- gets (^. registeredHere)
1097− size <- liftIO $ queueSize $ processQueue $ proc
1099 let reg = registeredNames registered
935 let reg = registeredNames registered
1100 dispatch (isLocal node (ProcessIdentifier from))
936 dispatch (isLocal node (ProcessIdentifier from))
1102 ProcessInfo {
939 ProcessInfo {
1103 infoNode = (processNodeId pid)
940 infoNode = (processNodeId pid)
1104 , infoRegisteredNames = reg
941 , infoRegisteredNames = reg
942+ -- we cannot populate this field
1105− , infoMessageQueueLength = size
943+ , infoMessageQueueLength = Nothing
1106− , infoMonitors = Set.toList itsMons
944+ , infoMonitors = Set.toList itsMons
1107− , infoLinks = Set.toList itsLinks
945+ , infoLinks = Set.toList itsLinks
1109− where dispatch :: (Serializable a)
947+ where dispatch :: (Serializable a, Show a)
1111 -> ProcessId
949 -> ProcessId
1113 -> NC ()
952 -> NC ()
1114− dispatch True dest pInfo = postAsMessage dest $ pInfo
953+ dispatch True dest _ pInfo = postAsMessage dest $ pInfo
1115− dispatch False dest pInfo =
954+ dispatch False dest node pInfo = do
1116− ncSendToProcess dest $ unsafeCreateUnencodedMessage pInfo
955+ liftIO $ sendMessage node
956+ (NodeIdentifier (localNodeId node))
957+ (ProcessIdentifier dest)
958+ WithImplicitReconnect
1118 registeredNames = Map.foldlWithKey (\ks k v -> if v == pid
961 registeredNames = Map.foldlWithKey (\ks k v -> if v == pid
1119 then (k:ks)
962 then (k:ks)
1120 else ks) []
963 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--------------------------------------------------------------------------------
965--------------------------------------------------------------------------------
1138-- Auxiliary --
966-- Auxiliary --
1139--------------------------------------------------------------------------------
967--------------------------------------------------------------------------------
@@ -1160,10 +988,14 @@ notifyDied dest src reason mRef = do
1160 throwException dest $ PortLinkException pid reason
988 throwException dest $ PortLinkException pid reason
1161 (False, _, _) ->
989 (False, _, _) ->
1162 -- The change in sender comes from [Unified: Table 10]
990 -- The change in sender comes from [Unified: Table 10]
991+ liftIO $ sendBinary node
992+ (NodeIdentifier $ localNodeId node)
1163− ncSendToNode (processNodeId dest) $ NCMsg
993+ (NodeIdentifier $ processNodeId dest)
994+ WithImplicitReconnect
1164− { ctrlMsgSender = NodeIdentifier (localNodeId node)
996+ { ctrlMsgSender = NodeIdentifier (localNodeId node)
1165− , ctrlMsgSignal = Died src reason
997+ , ctrlMsgSignal = Died src reason
1168-- | [Unified: Table 8]
1000-- | [Unified: Table 8]
1169destNid :: ProcessSignal -> Maybe NodeId
1001destNid :: ProcessSignal -> Maybe NodeId
@@ -1175,7 +1007,6 @@ destNid (Spawn _ _) = Nothing
1175destNid (Register _ _ _ _) = Nothing
1007destNid (Register _ _ _ _) = Nothing
1176destNid (WhereIs _) = Nothing
1008destNid (WhereIs _) = Nothing
1177destNid (NamedSend _ _) = Nothing
1009destNid (NamedSend _ _) = Nothing
1178−destNid (UnreliableSend _ _) = Nothing
1179-- We don't need to forward 'Died' signals; if monitoring/linking is setup,
1010-- 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
1011-- then when a local process dies the monitoring/linking machinery will take
1181-- care of notifying remote nodes
1012-- care of notifying remote nodes
@@ -1183,7 +1014,6 @@ destNid (Died _ _) = Nothing
1183destNid (Kill pid _) = Just $ processNodeId pid
1014destNid (Kill pid _) = Just $ processNodeId pid
1184destNid (Exit pid _) = Just $ processNodeId pid
1015destNid (Exit pid _) = Just $ processNodeId pid
1185destNid (GetInfo pid) = Just $ processNodeId pid
1016destNid (GetInfo pid) = Just $ processNodeId pid
1186−destNid (GetNodeStats nid) = Just nid
1187destNid (LocalSend pid _) = Just $ processNodeId pid
1017destNid (LocalSend pid _) = Just $ processNodeId pid
1188destNid (LocalPortSend cid _) = Just $ processNodeId (sendPortProcessId cid)
1018destNid (LocalPortSend cid _) = Just $ processNodeId (sendPortProcessId cid)
1189destNid (SigShutdown) = Nothing
1019destNid (SigShutdown) = Nothing
@@ -1202,7 +1032,7 @@ unClosure closure = do
1202isValidLocalIdentifier :: Identifier -> NC Bool
1032isValidLocalIdentifier :: Identifier -> NC Bool
1203isValidLocalIdentifier ident = do
1033isValidLocalIdentifier ident = do
1204 node <- ask
1034 node <- ask
1205− liftIO . withValidLocalState node $ \nSt ->
1035+ liftIO . withMVar (localState node) $ \nSt ->
1206 case ident of
1036 case ident of
1207 NodeIdentifier nid ->
1037 NodeIdentifier nid ->
1208 return $ nid == localNodeId node
1038 return $ nid == localNodeId node
@@ -1233,9 +1063,6 @@ postMessage pid msg = do
1233throwException :: Exception e => ProcessId -> e -> NC ()
1063throwException :: Exception e => ProcessId -> e -> NC ()
1234throwException pid e = do
1064throwException pid e = do
1235 node <- ask
1065 node <- ask
1236− -- throwTo blocks until the exception is received by the target thread.
1237− -- We cannot easily make it happen asynchronpusly because then 'unlink'
1238− -- semantics would break.
1239 liftIO $ withLocalProc node pid $ \p -> throwTo (processThread p) e
1066 liftIO $ withLocalProc node pid $ \p -> throwTo (processThread p) e
1241withLocalProc :: LocalNode -> ProcessId -> (LocalProcess -> IO ()) -> IO ()
1068withLocalProc :: LocalNode -> ProcessId -> (LocalProcess -> IO ()) -> IO ()
@@ -1243,17 +1070,17 @@ withLocalProc node pid p =
1243 -- By [Unified: table 6, rule missing_process] messages to dead processes
1070 -- By [Unified: table 6, rule missing_process] messages to dead processes
1244 -- can silently be dropped
1071 -- can silently be dropped
1245 let lpid = processLocalId pid in do
1072 let lpid = processLocalId pid in do
1246− join $ withValidLocalState node $ \vst ->
1247− return $ forM_ (vst ^. localProcessWithId lpid) p
1073+ mProc <- withMVar (localState node) $ return . (^. localProcessWithId lpid)
1249--------------------------------------------------------------------------------
1076--------------------------------------------------------------------------------
1250-- Accessors --
1077-- Accessors --
1251--------------------------------------------------------------------------------
1078--------------------------------------------------------------------------------
1253−links :: Accessor NCState (BiMultiMap Identifier ProcessId ())
1080+links :: Accessor NCState (Map Identifier (Set ProcessId))
1254links = accessor _links (\ls st -> st { _links = ls })
1081links = accessor _links (\ls st -> st { _links = ls })
1256−monitors :: Accessor NCState (BiMultiMap Identifier ProcessId MonitorRef)
1083+monitors :: Accessor NCState (Map Identifier (Set (ProcessId, MonitorRef)))
1257monitors = accessor _monitors (\ms st -> st { _monitors = ms })
1084monitors = accessor _monitors (\ms st -> st { _monitors = ms })
1259registeredHere :: Accessor NCState (Map String ProcessId)
1086registeredHere :: Accessor NCState (Map String ProcessId)
@@ -1262,6 +1089,12 @@ registeredHere = accessor _registeredHere (\ry st -> st { _registeredHere = ry }
1262registeredOnNodes :: Accessor NCState (Map ProcessId [(NodeId, Int)])
1089registeredOnNodes :: Accessor NCState (Map ProcessId [(NodeId, Int)])
1263registeredOnNodes = accessor _registeredOnNodes (\ry st -> st { _registeredOnNodes = ry })
1090registeredOnNodes = accessor _registeredOnNodes (\ry st -> st { _registeredOnNodes = ry })
1092+linksFor :: Identifier -> Accessor NCState (Set ProcessId)
1093+linksFor ident = links >>> DAC.mapDefault Set.empty ident
1095+monitorsFor :: Identifier -> Accessor NCState (Set (ProcessId, MonitorRef))
1096+monitorsFor ident = monitors >>> DAC.mapDefault Set.empty ident
1265registeredHereFor :: String -> Accessor NCState (Maybe ProcessId)
1098registeredHereFor :: String -> Accessor NCState (Maybe ProcessId)
1266registeredHereFor ident = registeredHere >>> DAC.mapMaybe ident
1099registeredHereFor ident = registeredHere >>> DAC.mapMaybe ident
@@ -1288,12 +1121,10 @@ registeredOnNodesFor ident = registeredOnNodes >>> DAC.mapMaybe ident
1288-- * the notifications for typed channels to that process.
1121-- * the notifications for typed channels to that process.
1290-- See https://github.com/haskell/containers/issues/14 for the bang on _v.
1123-- See https://github.com/haskell/containers/issues/14 for the bang on _v.
1291−splitNotif :: (Ord a, Ord v)
1292− => Identifier
1124+splitNotif :: Identifier
1293− -> BiMultiMap Identifier a v
1125+ -> Map Identifier a
1294− -> (Map Identifier (Set (a,v)), BiMultiMap Identifier a v)
1126+ -> (Map Identifier a, Map Identifier a)
1295−splitNotif ident =
1127+splitNotif ident = Map.partitionWithKey (\k !_v -> ident `impliesDeathOf` k)
1296− BiMultiMap.partitionWithKeyBy1st (\k !_v -> ident `impliesDeathOf` k)
1298--------------------------------------------------------------------------------
1129--------------------------------------------------------------------------------
1299-- Auxiliary --
1130-- Auxiliary --