git.iko.soy/distributed-process
on master help sign in
Don't set forking client separately
commit804900664851dbd6072e11779292b5b6ef411a30 authorEdsko de Vries <edsko@well-typed.com> dateFri 13 Apr 2012, 10:17 (15 years ago) parentbc4312e
7 files changed+78−170
benchmarks/JustPing.gnuplot−2 benchmarks/JustPingCacheHeader.hs+20−14 benchmarks/JustPingForkClient.hs−107 benchmarks/JustPingHaskell.hs+19−13 benchmarks/JustPingNaiveHeader.hs+19−13 benchmarks/JustPingOneRecv.hs+19−13 benchmarks/Makefile.JustPing+1−8
benchmarks/JustPing.gnuplot−2
@@ -2,7 +2,6 @@ set title "Roundtrip (us)"
22set yrange [0:200]
33plot "JustPingHaskell.data" smooth bezier with lines title "JustPingHaskell (NOT -threaded)", \
44 "JustPingHaskell2.data" smooth bezier with lines title "JustPingHaskell", \
5− "JustPingForkClient.data" smooth bezier with lines title "JustPingForkClient", \
65 "JustPingNaiveHeader.data" smooth bezier with lines title "JustPingNaiveHeader", \
76 "JustPingOneRecv.data" smooth bezier with lines title "JustPingOneRecv", \
87 "JustPingCacheHeader.data" smooth bezier with lines title "JustPingCacheHeader", \
@@ -11,7 +10,6 @@ set terminal postscript color
1110set output "JustPing.ps"
1211plot "JustPingHaskell.data" smooth bezier with lines title "JustPingHaskell (NOT -threaded)", \
1312 "JustPingHaskell2.data" smooth bezier with lines title "JustPingHaskell", \
14− "JustPingForkClient.data" smooth bezier with lines title "JustPingForkClient", \
1513 "JustPingNaiveHeader.data" smooth bezier with lines title "JustPingNaiveHeader", \
1614 "JustPingOneRecv.data" smooth bezier with lines title "JustPingOneRecv", \
1715 "JustPingCacheHeader.data" smooth bezier with lines title "JustPingCacheHeader", \
benchmarks/JustPingCacheHeader.hs+20−14
@@ -28,8 +28,9 @@ import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
2828
2929main :: IO ()
3030main = do
31− [pingsStr] <- getArgs
31+ [pingsStr] <- getArgs
3232 serverReady <- newEmptyMVar
33+ clientDone <- newEmptyMVar
3334
3435 -- Start the server
3536 forkIO $ do
@@ -51,19 +52,24 @@ main = do
5152 putStrLn "server: listening for pings"
5253 pong clientSock
5354
54− -- Client
55− takeMVar serverReady
56− let pings = read pingsStr
57− serverAddrs <- getAddrInfo
58− Nothing
59− (Just "127.0.0.1")
60− (Just "8080")
61− let serverAddr = head serverAddrs
62− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
63−
64− N.connect sock (addrAddress serverAddr)
65−
66− ping sock pings
55+ -- Start the client
56+ forkIO $ do
57+ takeMVar serverReady
58+ let pings = read pingsStr
59+ serverAddrs <- getAddrInfo
60+ Nothing
61+ (Just "127.0.0.1")
62+ (Just "8080")
63+ let serverAddr = head serverAddrs
64+ sock <- socket (addrFamily serverAddr) Stream defaultProtocol
65+
66+ N.connect sock (addrAddress serverAddr)
67+
68+ ping sock pings
69+ putMVar clientDone ()
70+
71+ -- Wait for the client to finish
72+ takeMVar clientDone
6773
6874pingMessage :: ByteString
6975pingMessage = pack "ping123"
benchmarks/JustPingForkClient.hsdeleted−107
@@ -1,107 +0,0 @@
1−{-# LANGUAGE CPP, BangPatterns #-}
2−
3−module Main where
4−
5−import Control.Monad
6−
7−import Data.Int
8−import qualified Data.Serialize as Ser
9−import Data.Word (Word8)
10−import Network.Socket
11− ( AddrInfoFlag (AI_PASSIVE), HostName, ServiceName, Socket
12− , SocketType (Stream), SocketOption (ReuseAddr)
13− , accept, addrAddress, addrFlags, addrFamily, bindSocket, defaultProtocol
14− , defaultHints
15− , getAddrInfo, listen, setSocketOption, socket, sClose, withSocketsDo )
16−import System.Environment (getArgs, withArgs)
17−import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
18−import System.IO (withFile, IOMode(..), hPutStrLn, Handle, stderr)
19−import Control.Concurrent (forkIO)
20−import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
21−import qualified Network.Socket as N
22−import Debug.Trace
23−import Data.ByteString (ByteString)
24−import Data.ByteString.Char8 (pack, unpack)
25−import qualified Data.ByteString as BS
26−import qualified Network.Socket.ByteString as NBS
27−import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
28−
29−main :: IO ()
30−main = do
31− [pingsStr] <- getArgs
32− serverReady <- newEmptyMVar
33− clientDone <- newEmptyMVar
34−
35− -- Start the server
36− forkIO $ do
37− putStrLn "server: creating TCP connection"
38− serverAddrs <- getAddrInfo
39− (Just (defaultHints { addrFlags = [AI_PASSIVE] } ))
40− Nothing
41− (Just "8080")
42− let serverAddr = head serverAddrs
43− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
44− setSocketOption sock ReuseAddr 1
45− bindSocket sock (addrAddress serverAddr)
46−
47− putStrLn "server: awaiting client connection"
48− putMVar serverReady ()
49− listen sock 1
50− (clientSock, clientAddr) <- accept sock
51−
52− putStrLn "server: listening for pings"
53− pong clientSock
54−
55− -- Client
56− forkIO $ do
57− takeMVar serverReady
58− let pings = read pingsStr
59− serverAddrs <- getAddrInfo
60− Nothing
61− (Just "127.0.0.1")
62− (Just "8080")
63− let serverAddr = head serverAddrs
64− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
65−
66− N.connect sock (addrAddress serverAddr)
67−
68− ping sock pings
69− putMVar clientDone ()
70−
71− -- Wait for the client to be complete
72− takeMVar clientDone
73−
74−pingMessage :: ByteString
75−pingMessage = pack "ping123"
76−
77−ping :: Socket -> Int -> IO ()
78−ping sock pings = go pings
79− where
80− go :: Int -> IO ()
81− go 0 = do
82− putStrLn $ "client did " ++ show pings ++ " pings"
83− go !i = do
84− before <- getCurrentTime
85− send sock pingMessage
86− bs <- recv sock 8
87− after <- getCurrentTime
88− -- putStrLn $ "client received " ++ unpack bs
89− let latency = (1e6 :: Double) * realToFrac (diffUTCTime after before)
90− hPutStrLn stderr $ show i ++ " " ++ show latency
91− go (i - 1)
92−
93−pong :: Socket -> IO ()
94−pong sock = do
95− bs <- recv sock 8
96− -- putStrLn $ "server received " ++ unpack bs
97− when (BS.length bs > 0) $ do
98− send sock bs
99− pong sock
100−
101−-- | Wrapper around NBS.recv (for profiling)
102−recv :: Socket -> Int -> IO ByteString
103−recv = NBS.recv
104−
105−-- | Wrapper around NBS.send (for profiling)
106−send :: Socket -> ByteString -> IO Int
107−send = NBS.send
benchmarks/JustPingHaskell.hs+19−13
@@ -28,8 +28,9 @@ import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
2828
2929main :: IO ()
3030main = do
31− [pingsStr] <- getArgs
31+ [pingsStr] <- getArgs
3232 serverReady <- newEmptyMVar
33+ clientDone <- newEmptyMVar
3334
3435 -- Start the server
3536 forkIO $ do
@@ -51,19 +52,24 @@ main = do
5152 putStrLn "server: listening for pings"
5253 pong clientSock
5354
54− -- Client
55− takeMVar serverReady
56− let pings = read pingsStr
57− serverAddrs <- getAddrInfo
58− Nothing
59− (Just "127.0.0.1")
60− (Just "8080")
61− let serverAddr = head serverAddrs
62− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
63−
64− N.connect sock (addrAddress serverAddr)
55+ -- Start the client
56+ forkIO $ do
57+ takeMVar serverReady
58+ let pings = read pingsStr
59+ serverAddrs <- getAddrInfo
60+ Nothing
61+ (Just "127.0.0.1")
62+ (Just "8080")
63+ let serverAddr = head serverAddrs
64+ sock <- socket (addrFamily serverAddr) Stream defaultProtocol
65+
66+ N.connect sock (addrAddress serverAddr)
67+
68+ ping sock pings
69+ putMVar clientDone ()
6570
66− ping sock pings
71+ -- Wait for the client to finish
72+ takeMVar clientDone
6773
6874pingMessage :: ByteString
6975pingMessage = pack "ping123"
benchmarks/JustPingNaiveHeader.hs+19−13
@@ -28,8 +28,9 @@ import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
2828
2929main :: IO ()
3030main = do
31− [pingsStr] <- getArgs
31+ [pingsStr] <- getArgs
3232 serverReady <- newEmptyMVar
33+ clientDone <- newEmptyMVar
3334
3435 -- Start the server
3536 forkIO $ do
@@ -51,19 +52,24 @@ main = do
5152 putStrLn "server: listening for pings"
5253 pong clientSock
5354
54− -- Client
55− takeMVar serverReady
56− let pings = read pingsStr
57− serverAddrs <- getAddrInfo
58− Nothing
59− (Just "127.0.0.1")
60− (Just "8080")
61− let serverAddr = head serverAddrs
62− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
63−
64− N.connect sock (addrAddress serverAddr)
55+ -- Start the client
56+ forkIO $ do
57+ takeMVar serverReady
58+ let pings = read pingsStr
59+ serverAddrs <- getAddrInfo
60+ Nothing
61+ (Just "127.0.0.1")
62+ (Just "8080")
63+ let serverAddr = head serverAddrs
64+ sock <- socket (addrFamily serverAddr) Stream defaultProtocol
65+
66+ N.connect sock (addrAddress serverAddr)
67+
68+ ping sock pings
69+ putMVar clientDone ()
6570
66− ping sock pings
71+ -- Wait for the client to finish
72+ takeMVar clientDone
6773
6874pingMessage :: ByteString
6975pingMessage = pack "ping123"
benchmarks/JustPingOneRecv.hs+19−13
@@ -28,8 +28,9 @@ import Data.Time (getCurrentTime, diffUTCTime, NominalDiffTime)
2828
2929main :: IO ()
3030main = do
31− [pingsStr] <- getArgs
31+ [pingsStr] <- getArgs
3232 serverReady <- newEmptyMVar
33+ clientDone <- newEmptyMVar
3334
3435 -- Start the server
3536 forkIO $ do
@@ -51,19 +52,24 @@ main = do
5152 putStrLn "server: listening for pings"
5253 pong clientSock
5354
54− -- Client
55− takeMVar serverReady
56− let pings = read pingsStr
57− serverAddrs <- getAddrInfo
58− Nothing
59− (Just "127.0.0.1")
60− (Just "8080")
61− let serverAddr = head serverAddrs
62− sock <- socket (addrFamily serverAddr) Stream defaultProtocol
63−
64− N.connect sock (addrAddress serverAddr)
55+ -- Start the client
56+ forkIO $ do
57+ takeMVar serverReady
58+ let pings = read pingsStr
59+ serverAddrs <- getAddrInfo
60+ Nothing
61+ (Just "127.0.0.1")
62+ (Just "8080")
63+ let serverAddr = head serverAddrs
64+ sock <- socket (addrFamily serverAddr) Stream defaultProtocol
65+
66+ N.connect sock (addrAddress serverAddr)
67+
68+ ping sock pings
69+ putMVar clientDone ()
6570
66− ping sock pings
71+ -- Wait for the client to finish
72+ takeMVar clientDone
6773
6874pingMessage :: ByteString
6975pingMessage = pack "ping123"
benchmarks/Makefile.JustPing+1−8
@@ -6,7 +6,6 @@ NUMPINGS=100000
66run: JustPingC.data \
77 JustPingHaskell.data \
88 JustPingHaskell2.data \
9− JustPingForkClient.data \
109 JustPingNaiveHeader.data \
1110 JustPingOneRecv.data \
1211 JustPingCacheHeader.data
@@ -21,9 +20,6 @@ JustPingHaskell.data: JustPingHaskell
2120JustPingHaskell2.data: JustPingHaskell2
2221 time ./JustPingHaskell2 $(NUMPINGS) 2>JustPingHaskell2.data
2322
24−JustPingForkClient.data: JustPingForkClient
25− time ./JustPingForkClient $(NUMPINGS) 2>JustPingForkClient.data
26−
2723JustPingNaiveHeader.data: JustPingNaiveHeader
2824 time ./JustPingNaiveHeader $(NUMPINGS) 2>JustPingNaiveHeader.data
2925
@@ -42,9 +38,6 @@ JustPingHaskell: JustPingHaskell.hs
4238JustPingHaskell2: JustPingHaskell.hs
4339 ghc -o JustPingHaskell2 -O2 -threaded JustPingHaskell.hs
4440
45−JustPingForkClient: JustPingForkClient.hs
46− ghc -o JustPingForkClient -O2 -threaded JustPingForkClient.hs
47−
4841JustPingNaiveHeader: JustPingNaiveHeader.hs
4942 ghc -o JustPingNaiveHeader -O2 -threaded JustPingNaiveHeader.hs
5043
@@ -56,6 +49,6 @@ JustPingCacheHeader: JustPingCacheHeader.hs
5649
5750.PHONY: clean
5851clean:
59− rm -f *.data *.ps *.pdf JustPingC JustPingHaskell JustPingHaskell2 JustPingForkClient JustPingNaiveHeader JustPingOneRecv JustPingCacheHeader
52+ rm -f *.data *.ps *.pdf JustPingC JustPingHaskell JustPingHaskell2 JustPingNaiveHeader JustPingOneRecv JustPingCacheHeader
6053
6154# vi:set noexpandtab: