929e832 · distributed-process

examples/DemoTCP.hs+2−2

compare with master

unifiedsplit

@@ -45,7 +45,7 @@ main = do

45 [clientMessage] <- receive masterTargetEnd

46 print clientMessage

47

48− closeAll masterTargetEnd

48+ closeTargetEnd masterTargetEnd

49 putStrLn "master: close connections"

50

51 -- Slave:

@@ -61,7 +61,7 @@ main = do

61 send masterSourceEnd [BS.pack message]

62 putStrLn "slave: sent message to master"

63

64− close masterSourceEnd

64+ closeSourceEnd masterSourceEnd

65 putStrLn "slave: close connection"

66

67 _ -> error "Unexpected arguments"

network-transport/src/Network/Transport.hs+2−2

@@ -72,7 +72,7 @@ defaultSourceHints = SourceHints

72-- end. Connections between other sources the target end remain unaffected

73data SourceEnd = SourceEnd

74 { send :: [ByteString] -> IO ()

75− , close :: IO ()

75+ , closeSourceEnd :: IO ()

76 }

77

78-- | A `TargetEnd` provides a `receive` function that allows messages

@@ -81,7 +81,7 @@ data SourceEnd = SourceEnd

81-- and all new connections will be refused.

82data TargetEnd = TargetEnd

83 { receive :: IO [ByteString]

84− , closeAll :: IO ()

84+ , closeTargetEnd :: IO ()

85 }

86

87newtype MulticastSourceEnd = MulticastSourceEnd

network-transport/src/Network/Transport/TCP.hs+2−2

@@ -86,7 +86,7 @@ mkTransport (TCPConfig _hints host service) = withSocketsDo $ do

86 NBS.sendAll sock $ BS.pack . show $ chanId

87 return $ SourceEnd

88 { send = \bss -> NBS.sendMany sock bss

89− , close = sClose sock

89+ , closeSourceEnd = sClose sock

90 }

91

92 mkTargetEnd :: Chan ByteString -> MVar [Socket] -> TargetEnd

@@ -95,7 +95,7 @@ mkTransport (TCPConfig _hints host service) = withSocketsDo $ do

95 receive = do

96 bs <- readChan chan

97 return [bs]

98− , closeAll = takeMVar socks >>= mapM_ sClose

98+ , closeTargetEnd = takeMVar socks >>= mapM_ sClose

99 }

100

101 procConnections :: Chans -> Socket -> IO ()