Skip to content

Commit bbb3a2e

Browse files
hyperthunkhyperthunk
authored
make it possible to verify against latest snapshot on stackage
Merge pull request #319
2 parents e0092ac + 3083672 commit bbb3a2e

File tree

17 files changed

+504
-313
lines changed

17 files changed

+504
-313
lines changed

‎benchmarks/Channels.hs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Control.Monad
44
import Control.Applicative
55
import Control.Distributed.Process
66
import Control.Distributed.Process.Node
7-
import Network.Transport.TCP (createTransport, defaultTCPParameters)
7+
import Network.Transport.TCP (createTransport, defaultTCPAddr, defaultTCPParameters)
88
import Data.Binary (encode, decode)
99
import qualified Data.ByteString.Lazy as BSL
1010

@@ -36,7 +36,8 @@ initialProcess "CLIENT" = do
3636
main :: IO ()
3737
main = do
3838
[role, host, port] <- getArgs
39-
Right transport <- createTransport
40-
host port (\sn -> (host, port)) defaultTCPParameters
41-
node <- newLocalNode transport initRemoteTable
42-
runProcess node $ initialProcess role
39+
trans <- createTransport (defaultTCPAddr host port) defaultTCPParameters
40+
case trans of
41+
Right transport -> do node <- newLocalNode transport initRemoteTable
42+
runProcess node $ initialProcess role
43+
Left other -> error $ show other

‎benchmarks/Latency.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Control.Monad
33
import Control.Applicative
44
import Control.Distributed.Process
55
import Control.Distributed.Process.Node
6-
import Network.Transport.TCP (createTransport, defaultTCPParameters)
6+
import Network.Transport.TCP (createTransport, defaultTCPAddr, defaultTCPParameters)
77
import Data.Binary (encode, decode)
88
import qualified Data.ByteString.Lazy as BSL
99

@@ -31,7 +31,9 @@ initialProcess "CLIENT" = do
3131
main :: IO ()
3232
main = do
3333
[role, host, port] <- getArgs
34-
Right transport <- createTransport
35-
host port (\sn -> (host, sn)) defaultTCPParameters
36-
node <- newLocalNode transport initRemoteTable
37-
runProcess node $ initialProcess role
34+
trans <- createTransport
35+
(defaultTCPAddr host port) defaultTCPParameters
36+
case trans of
37+
Right transport -> do node <- newLocalNode transport initRemoteTable
38+
runProcess node $ initialProcess role
39+
Left other -> error $ show other

‎benchmarks/ProcessRing.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Control.Monad
1212
import Control.Distributed.Process hiding (catch)
1313
import Control.Distributed.Process.Node
1414
import Control.Exception (catch, SomeException)
15-
import Network.Transport.TCP (createTransport, defaultTCPParameters)
15+
import Network.Transport.TCP (createTransport, defaultTCPAddr, defaultTCPParameters)
1616
import System.Environment
1717
import System.Console.GetOpt
1818

@@ -111,7 +111,7 @@ main = do
111111
(opt, _) <- parseArgv argv
112112
putStrLn $ "options: " ++ (show opt)
113113
Right transport <- createTransport
114-
"127.0.0.1" "8090" (\sn -> ("127.0.0.1", sn)) defaultTCPParameters
114+
(defaultTCPAddr "127.0.0.1" "8090" ) defaultTCPParameters
115115
node <- newLocalNode transport initRemoteTable
116116
catch (void $ runProcess node $ initialProcess opt)
117117
(\(e :: SomeException) -> putStrLn $ "ERROR: " ++ (show e))

‎benchmarks/Spawns.hs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Control.Monad
77
import Control.Applicative
88
import Control.Distributed.Process
99
import Control.Distributed.Process.Node
10-
import Network.Transport.TCP (createTransport, defaultTCPParameters)
10+
import Network.Transport.TCP (createTransport, defaultTCPAddr, defaultTCPParameters)
1111
import Data.Binary (encode, decode)
1212
import qualified Data.ByteString.Lazy as BSL
1313

@@ -42,7 +42,8 @@ initialProcess "CLIENT" = do
4242
main :: IO ()
4343
main = do
4444
[role, host, port] <- getArgs
45-
Right transport <- createTransport
46-
host port (\sn -> (host, sn)) defaultTCPParameters
47-
node <- newLocalNode transport initRemoteTable
48-
runProcess node $ initialProcess role
45+
trans <- createTransport (defaultTCPAddr host port) defaultTCPParameters
46+
case trans of
47+
Right transport -> do node <- newLocalNode transport initRemoteTable
48+
runProcess node $ initialProcess role
49+
Left other -> error $ show other

‎benchmarks/Throughput.hs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Control.Monad
66
import Control.Applicative
77
import Control.Distributed.Process
88
import Control.Distributed.Process.Node
9-
import Network.Transport.TCP (createTransport, defaultTCPParameters)
9+
import Network.Transport.TCP (createTransport, defaultTCPParameters, defaultTCPAddr)
1010
import Data.Binary
1111
import qualified Data.ByteString.Lazy as BSL
1212
import Data.Typeable
@@ -67,7 +67,8 @@ initialProcess "CLIENT" = do
6767
main :: IO ()
6868
main = do
6969
[role, host, port] <- getArgs
70-
Right transport <- createTransport
71-
host port (\sn -> (host, sn)) defaultTCPParameters
72-
node <- newLocalNode transport initRemoteTable
73-
runProcess node $ initialProcess role
70+
trans <- createTransport (defaultTCPAddr host port) defaultTCPParameters
71+
case trans of
72+
Right transport -> do node <- newLocalNode transport initRemoteTable
73+
runProcess node $ initialProcess role
74+
Left other -> error $ show other

‎distributed-process-tests/distributed-process-tests.cabal

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ library
3333
distributed-static,
3434
HUnit >= 1.2 && < 1.7,
3535
network-transport >= 0.4.1.0 && < 0.6,
36-
network >= 2.5 && < 2.7,
36+
network >= 2.5 && < 2.9,
3737
random >= 1.0 && < 1.2,
3838
rematch >= 0.1.2.1,
3939
setenv >= 0.1.1.3,
@@ -60,7 +60,7 @@ Test-Suite TestCHInMemory
6060
CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.CH
6161
Build-Depends: base >= 4.4 && < 5,
6262
distributed-process-tests,
63-
network >= 2.3 && < 2.7,
63+
network >= 2.3 && < 2.9,
6464
network-transport >= 0.4.1.0 && < 0.6,
6565
network-transport-inmemory >= 0.5,
6666
test-framework >= 0.6 && < 0.9
@@ -75,7 +75,7 @@ Test-Suite TestCHInTCP
7575
if flag(tcp)
7676
Build-Depends: base >= 4.4 && < 5,
7777
distributed-process-tests,
78-
network >= 2.3 && < 2.7,
78+
network >= 2.3 && < 2.9,
7979
network-transport >= 0.4.1.0 && < 0.6,
8080
network-transport-tcp >= 0.5 && < 0.7,
8181
test-framework >= 0.6 && < 0.9
@@ -92,7 +92,7 @@ Test-Suite TestClosure
9292
CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Closure
9393
Build-Depends: base >= 4.4 && < 5,
9494
distributed-process-tests,
95-
network >= 2.3 && < 2.7,
95+
network >= 2.3 && < 2.9,
9696
network-transport >= 0.4.1.0 && < 0.6,
9797
network-transport-inmemory >= 0.5,
9898
test-framework >= 0.6 && < 0.9
@@ -106,7 +106,7 @@ Test-Suite TestStats
106106
CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Stats
107107
Build-Depends: base >= 4.4 && < 5,
108108
distributed-process-tests,
109-
network >= 2.3 && < 2.7,
109+
network >= 2.3 && < 2.9,
110110
network-transport >= 0.4.1.0 && < 0.6,
111111
network-transport-inmemory >= 0.5,
112112
test-framework >= 0.6 && < 0.9
@@ -121,7 +121,7 @@ Test-Suite TestMx
121121
CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Mx
122122
Build-Depends: base >= 4.4 && < 5,
123123
distributed-process-tests,
124-
network >= 2.3 && < 2.7,
124+
network >= 2.3 && < 2.9,
125125
network-transport >= 0.4.1.0 && < 0.6,
126126
network-transport-inmemory >= 0.5,
127127
test-framework >= 0.6 && < 0.9
@@ -135,7 +135,7 @@ Test-Suite TestTracing
135135
CPP-Options: -DTEST_SUITE_MODULE=Control.Distributed.Process.Tests.Tracing
136136
Build-Depends: base >= 4.4 && < 5,
137137
distributed-process-tests,
138-
network >= 2.3 && < 2.7,
138+
network >= 2.3 && < 2.9,
139139
network-transport >= 0.4.1.0 && < 0.6,
140140
network-transport-inmemory >= 0.5,
141141
test-framework >= 0.6 && < 0.9

0 commit comments

Comments
 (0)