git.iko.soy/distributed-process
on master help sign in
Rename close/closeAll to closeSourceEnd/closeTargetEnd
commit929e832cdc32661ebe097675829e61af02f97c7d authorNicolas Wu <nick@well-typed.com> dateThu 12 Jan 2012, 17:37 (15 years ago) parente17b03e
3 files changed+6−6
compare with master
unifiedsplit
examples/DemoTCP.hs+2−2 network-transport/src/Network/Transport.hs+2−2 network-transport/src/Network/Transport/TCP.hs+2−2
examples/DemoTCP.hs+2−2
@@ -45,7 +45,7 @@ main = do
4545 [clientMessage] <- receive masterTargetEnd
4646 print clientMessage
4747
48− closeAll masterTargetEnd
48+ closeTargetEnd masterTargetEnd
4949 putStrLn "master: close connections"
5050
5151 -- Slave:
@@ -61,7 +61,7 @@ main = do
6161 send masterSourceEnd [BS.pack message]
6262 putStrLn "slave: sent message to master"
6363
64− close masterSourceEnd
64+ closeSourceEnd masterSourceEnd
6565 putStrLn "slave: close connection"
6666
6767 _ -> error "Unexpected arguments"
network-transport/src/Network/Transport.hs+2−2
@@ -72,7 +72,7 @@ defaultSourceHints = SourceHints
7272-- end. Connections between other sources the target end remain unaffected
7373data SourceEnd = SourceEnd
7474 { send :: [ByteString] -> IO ()
75− , close :: IO ()
75+ , closeSourceEnd :: IO ()
7676 }
7777
7878-- | A `TargetEnd` provides a `receive` function that allows messages
@@ -81,7 +81,7 @@ data SourceEnd = SourceEnd
8181-- and all new connections will be refused.
8282data TargetEnd = TargetEnd
8383 { receive :: IO [ByteString]
84− , closeAll :: IO ()
84+ , closeTargetEnd :: IO ()
8585 }
8686
8787newtype MulticastSourceEnd = MulticastSourceEnd
network-transport/src/Network/Transport/TCP.hs+2−2
@@ -86,7 +86,7 @@ mkTransport (TCPConfig _hints host service) = withSocketsDo $ do
8686 NBS.sendAll sock $ BS.pack . show $ chanId
8787 return $ SourceEnd
8888 { send = \bss -> NBS.sendMany sock bss
89− , close = sClose sock
89+ , closeSourceEnd = sClose sock
9090 }
9191
9292 mkTargetEnd :: Chan ByteString -> MVar [Socket] -> TargetEnd
@@ -95,7 +95,7 @@ mkTransport (TCPConfig _hints host service) = withSocketsDo $ do
9595 receive = do
9696 bs <- readChan chan
9797 return [bs]
98− , closeAll = takeMVar socks >>= mapM_ sClose
98+ , closeTargetEnd = takeMVar socks >>= mapM_ sClose
9999 }
100100
101101 procConnections :: Chans -> Socket -> IO ()