git.iko.soy/distributed-process
on a5daa9a help sign in
660d554
swap
2 ahead, 790 behind
3 files changed+24−7
since splitsnapshots
unifiedsplit
doc/tutorial/tutorial-client.hs+8−4 doc/tutorial/tutorial-server.hs+5−3 install_all.sh+11
doc/tutorial/tutorial-client.hs+8−4
@@ -1,5 +1,5 @@
1−import Network.Transport
2−import Network.Transport.TCP (createTransport)
1+import Network.Transport
2+import Network.Transport.TCP (createTransport, defaultTCPParameters)
33import System.Environment
44import Control.Monad
55import Data.ByteString.Char8
@@ -7,11 +7,15 @@ import Data.ByteString.Char8
77main :: IO ()
88main = do
99 [host, port, serverAddr] <- getArgs
10− Right transport <- createTransport host port
10+ Right transport <- createTransport host port defaultTCPParameters
1111 Right endpoint <- newEndPoint transport
1212
1313 let addr = EndPointAddress (pack serverAddr)
14− Right conn <- connect endpoint addr ReliableOrdered
14+-- Right conn <- connect endpoint addr ReliableOrdered defaultConnectHints
15+ x <- connect endpoint addr ReliableOrdered defaultConnectHints
16+ let conn = case x of
17+ Right conn -> conn
18+ Left err -> error$ "Error connecting: "++show err
1519 send conn [pack "Hello world"]
1620 close conn
1721
doc/tutorial/tutorial-server.hs+5−3
@@ -1,5 +1,5 @@
11import Network.Transport
2−import Network.Transport.TCP (createTransport)
2+import Network.Transport.TCP (createTransport, defaultTCPParameters)
33import Control.Concurrent
44import Data.Map
55import Control.Exception
@@ -14,9 +14,10 @@ echoServer endpoint serverDone = go empty
1414 event <- receive endpoint
1515 case event of
1616 ConnectionOpened cid rel addr -> do
17+ putStrLn$ " New connection: ID "++show cid++", reliability: "++show rel++", address: "++ show addr
1718 connMVar <- newEmptyMVar
1819 forkIO $ do
19− Right conn <- connect endpoint addr rel
20+ Right conn <- connect endpoint addr rel defaultConnectHints
2021 putMVar connMVar conn
2122 go (insert cid connMVar cs)
2223 Received cid payload -> do
@@ -26,6 +27,7 @@ echoServer endpoint serverDone = go empty
2627 return ()
2728 go cs
2829 ConnectionClosed cid -> do
30+ putStrLn$ " Closed connection: ID "++show cid
2931 forkIO $ do
3032 conn <- readMVar (cs ! cid)
3133 close conn
@@ -45,7 +47,7 @@ main :: IO ()
4547main = do
4648 [host, port] <- getArgs
4749 serverDone <- newEmptyMVar
48− Right transport <- createTransport host port
50+ Right transport <- createTransport host port defaultTCPParameters
4951 Right endpoint <- newEndPoint transport
5052 forkIO $ echoServer endpoint serverDone
5153 putStrLn $ "Echo server started at " ++ show (address endpoint)
install_all.shnew file+11
@@ -0,0 +1,11 @@
1+#!/bin/bash
2+
3+if [ "$GHC" == "" ]; then
4+ GHC=ghc
5+fi
6+if [ "$CABAL" == "" ]; then
7+ CABAL=cabal
8+fi
9+
10+$CABAL install --with-ghc=$GHC ./network-transport ./network-transport-tcp ./network-transport-inmemory ./distributed-process ./distributed-process-simplelocalnet --reinstall $*
11+