git.iko.soy/distributed-process
on master help sign in
More cleanup
a0c7adcEdsko de Vries
distributed-process/src/Control/Distributed/Process/Internal/Process/Primitives.hs−2
compare with master
unifiedsplit
@@ -99,8 +99,6 @@ import Control.Distributed.Process.Internal.Node (runLocalProcess)
99send :: Serializable a => ProcessId -> a -> Process ()
99send :: Serializable a => ProcessId -> a -> Process ()
100-- This requires a lookup on every send. If we want to avoid that we need to
100-- This requires a lookup on every send. If we want to avoid that we need to
101-- modify serializable to allow for stateful (IO) deserialization
101-- modify serializable to allow for stateful (IO) deserialization
102−-- Warning: if we change how 'send' is implemented, might also want to change
103−-- the implementation of 'Internal.Closure.TH.generateSender'
104send them msg = procMsg $ sendMessage (ProcessIdentifier them) msg
102send them msg = procMsg $ sendMessage (ProcessIdentifier them) msg
105
103
106-- | Wait for a message of a specific type
104-- | Wait for a message of a specific type
distributed-process/src/Control/Distributed/Process/Node.hs+12−3
@@ -282,12 +282,21 @@ handleIncomingMessages node = go [] Map.empty Map.empty Set.empty
282 { ctrlMsgSender = nid
282 { ctrlMsgSender = nid
283 , ctrlMsgSignal = Died nid DiedDisconnect
283 , ctrlMsgSignal = Died nid DiedDisconnect
284 }
284 }
285− NT.ErrorEvent _ ->
285+ NT.ErrorEvent (NT.TransportError (NT.EventConnectionLost Nothing _) _) ->
286+ -- We cannot really deal with the case that some (but not all)
287+ -- incoming connections from a remote node have failed (what if this
288+ -- incoming connection corresponds to a typed channel, for instance?)
286− fail "handleIncomingMessages: TODO 3"
289+ fail "handleIncomingMessages: TODO"
290+ NT.ErrorEvent (NT.TransportError NT.EventEndPointFailed str) ->
291+ fail $ "Cloud Haskell fatal error: end point failed: " ++ str
292+ NT.ErrorEvent (NT.TransportError NT.EventTransportFailed str) ->
293+ fail $ "Cloud Haskell fatal error: transport failed: " ++ str
287 NT.EndPointClosed ->
294 NT.EndPointClosed ->
288 return ()
295 return ()
289 NT.ReceivedMulticast _ _ ->
296 NT.ReceivedMulticast _ _ ->
290− fail "handleIncomingMessages: TODO 4"
297+ -- If we received a multicast message, something went horribly wrong
298+ -- and we just give up
299+ fail "Cloud Haskell fatal error: received unexpected multicast"
291
300
292 state = localState node
301 state = localState node
293 endpoint = localEndPoint node
302 endpoint = localEndPoint node