Skip to content

Commit 8f17341

Browse files
nfrisbynfrisby
committed
Correct function name kilobytes to kibibytes
1 parent d4aefd0 commit 8f17341

File tree

13 files changed

+51
-47
lines changed

13 files changed

+51
-47
lines changed

‎simulation/src/Chan.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import Control.Monad.Class.MonadFork (MonadFork)
3333
import Control.Tracer (Contravariant (contramap), Tracer)
3434
import Data.Maybe (fromMaybe)
3535
import GHC.Generics
36-
import ModelTCP (kilobytes, mkTcpConnProps)
36+
import ModelTCP (kibibytes, mkTcpConnProps)
3737
import TimeCompat (DiffTime, MonadDelay, MonadMonotonicTimeNSec, MonadTime)
3838

3939
data ConnectionConfig = ConnectionConfig
@@ -47,7 +47,7 @@ mkConnectionConfig tcp mux tcpLatency maybeTcpBandwidth = ConnectionConfig{..}
4747
transportConfig
4848
| tcp = TransportTcp (mkTcpConnProps tcpLatency (fromMaybe defaultTcpBandwidth maybeTcpBandwidth))
4949
| otherwise = TransportSimple (SimpleConnProps tcpLatency maybeTcpBandwidth)
50-
defaultTcpBandwidth = (kilobytes 1000)
50+
defaultTcpBandwidth = (kibibytes 1000)
5151

5252
data TransportConfig
5353
= TransportSimple !SimpleConnProps

‎simulation/src/ExamplesRelay.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module ExamplesRelay where
22

33
import Data.Word (Word8)
4-
import ModelTCP (kilobytes, mkTcpConnProps)
4+
import ModelTCP (kibibytes, mkTcpConnProps)
55
import RelayProtocol (BlockRelayMessage (..), BlockTTL)
66
import SimRelay (
77
PacketGenerationPattern (UniformGenerationPattern),
@@ -35,8 +35,8 @@ example1 =
3535
where
3636
trace =
3737
traceRelayLink1
38-
(mkTcpConnProps 0.3 (kilobytes 1000))
39-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
38+
(mkTcpConnProps 0.3 (kibibytes 1000))
39+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
4040

4141
example2 :: Visualization
4242
example2 =
@@ -50,8 +50,8 @@ example2 =
5050
where
5151
trace =
5252
traceRelayLink4
53-
(mkTcpConnProps 0.3 (kilobytes 1000))
54-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
53+
(mkTcpConnProps 0.3 (kibibytes 1000))
54+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
5555

5656
example3 :: Visualization
5757
example3 =
@@ -65,9 +65,9 @@ example3 =
6565
where
6666
trace =
6767
traceRelayLink4Asymmetric
68-
(mkTcpConnProps 0.2 (kilobytes 1000))
69-
(mkTcpConnProps 0.3 (kilobytes 1000))
70-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
68+
(mkTcpConnProps 0.2 (kibibytes 1000))
69+
(mkTcpConnProps 0.3 (kibibytes 1000))
70+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
7171

7272
examplesRelaySimVizConfig :: RelaySimVizConfig
7373
examplesRelaySimVizConfig =

‎simulation/src/ExamplesRelayP2P.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module ExamplesRelayP2P where
55
import Data.Functor.Contravariant (Contravariant (contramap))
66
import Data.Maybe (fromMaybe)
77
import Data.Word (Word8)
8-
import ModelTCP (kilobytes, mkTcpConnProps)
8+
import ModelTCP (kibibytes, mkTcpConnProps)
99
import P2P (P2PTopographyCharacteristics (..), genArbitraryP2PTopography)
1010
import RelayProtocol
1111
import SimRelay
@@ -63,7 +63,7 @@ example1 =
6363
{ blockProcessingDelay = const (secondsToDiffTime 0.1) -- 100ms
6464
, blockGeneration =
6565
PoissonGenerationPattern
66-
(kilobytes 96)
66+
(kibibytes 96)
6767
rng
6868
-- average seconds between blocks:
6969
(0.2 * fromIntegral p2pNumNodes)
@@ -156,7 +156,7 @@ example2 =
156156
{ blockProcessingDelay = const (secondsToDiffTime 0.1) -- 100ms
157157
, blockGeneration =
158158
PoissonGenerationPattern
159-
(kilobytes 96)
159+
(kibibytes 96)
160160
rng
161161
-- average seconds between blocks:
162162
(0.5 * fromIntegral p2pNumNodes)

‎simulation/src/ExamplesTCP.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ example1 =
3939
model = tcpSimVizModel trace
4040
where
4141
trace = traceTcpLinks1 tcpprops trafficPattern
42-
tcpprops = mkTcpConnProps 0.3 (kilobytes 1000)
43-
trafficPattern = mkUniformTrafficPattern 20 (kilobytes 100) 0
42+
tcpprops = mkTcpConnProps 0.3 (kibibytes 1000)
43+
trafficPattern = mkUniformTrafficPattern 20 (kibibytes 100) 0
4444

4545
title = "Sending 20x 100kb messages over TCP"
4646

@@ -112,10 +112,10 @@ example2 =
112112
trace1 = traceTcpLinks4 tcpprops1 tcpprops1 tcpprops1 trafficPattern
113113
trace2 = traceTcpLinks4 tcpprops2 tcpprops2 tcpprops2 trafficPattern
114114

115-
tcpprops1 = mkTcpConnProps 0.3 (kilobytes 1000)
116-
tcpprops2 = mkTcpConnProps 0.3 (kilobytes 10000)
115+
tcpprops1 = mkTcpConnProps 0.3 (kibibytes 1000)
116+
tcpprops2 = mkTcpConnProps 0.3 (kibibytes 10000)
117117

118-
trafficPattern = mkUniformTrafficPattern 15 (kilobytes 100) 0
118+
trafficPattern = mkUniformTrafficPattern 15 (kibibytes 100) 0
119119

120120
example3 :: Visualization
121121
example3 =
@@ -141,10 +141,10 @@ example3 =
141141
trace1 = traceTcpLinks4 tcpprops tcpprops tcpprops trafficPattern1
142142
trace2 = traceTcpLinks4 tcpprops tcpprops tcpprops trafficPattern2
143143

144-
tcpprops = mkTcpConnProps 0.3 (kilobytes 1000)
144+
tcpprops = mkTcpConnProps 0.3 (kibibytes 1000)
145145

146-
trafficPattern1 = mkUniformTrafficPattern 15 (kilobytes 100) 1.2
147-
trafficPattern2 = mkUniformTrafficPattern 30 (kilobytes 50) 0.6
146+
trafficPattern1 = mkUniformTrafficPattern 15 (kibibytes 100) 1.2
147+
trafficPattern2 = mkUniformTrafficPattern 30 (kibibytes 50) 0.6
148148

149149
examplesTcpSimVizConfig :: TcpSimVizConfig TestMessage
150150
examplesTcpSimVizConfig =

‎simulation/src/LeiosProtocol/Short/Sim.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,9 @@ traceRelayLink1 connectionOptions =
460460
, sizes -- TODO: realistic sizes
461461
=
462462
SizesConfig
463-
{ inputBlockHeader = kilobytes 1
464-
, inputBlockBodyAvgSize = kilobytes 95
465-
, inputBlockBodyMaxSize = kilobytes 100
463+
{ inputBlockHeader = kibibytes 1
464+
, inputBlockBodyAvgSize = kibibytes 95
465+
, inputBlockBodyMaxSize = kibibytes 100
466466
, endorseBlock = \eb -> coerce (length eb.inputBlocks) * 32 + 32 + 128
467467
, voteMsg = \v -> fromIntegral v.votes * 32 + 32 + 128
468468
, certificate = const (50 * 1024)

‎simulation/src/LeiosProtocol/Short/VizSimP2P.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,6 @@ example2
786786
]
787787
where
788788
processingCores = maximum $ Map.elems p2pNodeCores
789-
config = defaultVizConfig voteSendStage 5 processingCores (10 * kilobytes 1000) -- TODO: calculate from p2pLinks
789+
config = defaultVizConfig voteSendStage 5 processingCores (10 * kibibytes 1000) -- TODO: calculate from p2pLinks
790790
modelConfig = config.model
791791
model = leiosSimVizModel modelConfig (exampleTrace2' rng leiosConfig p2pNetwork False)

‎simulation/src/LeiosProtocol/VizSimTestRelay.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ example1 =
4747
where
4848
trace =
4949
traceRelayLink1
50-
(mkTcpConnProps 0.3 (kilobytes 1000))
51-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
50+
(mkTcpConnProps 0.3 (kibibytes 1000))
51+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
5252

5353
example2 :: Visualization
5454
example2 =
@@ -62,8 +62,8 @@ example2 =
6262
where
6363
trace =
6464
traceRelayLink4
65-
(mkTcpConnProps 0.3 (kilobytes 1000))
66-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
65+
(mkTcpConnProps 0.3 (kibibytes 1000))
66+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
6767

6868
example3 :: Visualization
6969
example3 =
@@ -77,9 +77,9 @@ example3 =
7777
where
7878
trace =
7979
traceRelayLink4Asymmetric
80-
(mkTcpConnProps 0.2 (kilobytes 1000))
81-
(mkTcpConnProps 0.3 (kilobytes 1000))
82-
(UniformGenerationPattern (kilobytes 100) 0.2 5.0)
80+
(mkTcpConnProps 0.2 (kibibytes 1000))
81+
(mkTcpConnProps 0.3 (kibibytes 1000))
82+
(UniformGenerationPattern (kibibytes 100) 0.2 5.0)
8383

8484
examplesRelaySimVizConfig :: RelaySimVizConfig
8585
examplesRelaySimVizConfig =

‎simulation/src/Main.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import qualified LeiosProtocol.Short.DataSimP2P as DataShortLeiosP2P
2424
import qualified LeiosProtocol.Short.VizSim as VizShortLeios
2525
import qualified LeiosProtocol.Short.VizSimP2P as VizShortLeiosP2P
2626
import qualified LeiosProtocol.VizSimTestRelay as VizSimTestRelay
27-
import ModelTCP (kilobytes)
27+
import ModelTCP (kibibytes)
2828
import Options.Applicative (
2929
Alternative ((<|>)),
3030
HasValue,
@@ -523,7 +523,7 @@ parserOverrideUnlimited =
523523
( long "override-unlimited-bandwidth"
524524
<> metavar "BYTESPERSEC"
525525
<> help "Values to use for link bandwidth instead of unlimited (which is not supported yet)."
526-
<> shownDefValue (fromBytes $ kilobytes 1000)
526+
<> shownDefValue (fromBytes $ kibibytes 1000)
527527
)
528528

529529
--------------------------------------------------------------------------------

‎simulation/src/ModelTCP.hs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ module ModelTCP (
1818
TcpEvent (..),
1919
traceTcpSend,
2020
mkTcpConnProps,
21-
kilobytes,
21+
kibibytes,
22+
megabytes,
2223
segments,
2324
bytesToKb,
2425
) where
@@ -45,7 +46,7 @@ data TcpConnProps = TcpConnProps
4546
-- links.
4647
, tcpBandwidth :: !Bytes
4748
-- ^ The sender serialisation bandwidth in bytes per sec. Typical values
48-
-- would be a few hundred kilobytes per second, e.g. 100 kb\/s is
49+
-- would be a few hundred kibibytes per second, e.g. 100 kb\/s is
4950
-- 0.8 MBit\/s, which is close to 1 MBit\/s once overheads are included.
5051
, tcpReceiverWindow :: !Bytes
5152
-- ^ The size of the receiver's window, which is an upper bound on the
@@ -75,8 +76,11 @@ mkTcpConnProps latency bandwidth =
7576
-- set it big enough to not constrain the bandwidth
7677
recvwnd = Bytes (ceiling (fromIntegral (fromBytes bandwidth) * latency * 2))
7778

78-
kilobytes :: Int -> Bytes
79-
kilobytes kb = Bytes kb * 1024
79+
kibibytes :: Int -> Bytes
80+
kibibytes kb = Bytes kb * 1024
81+
82+
megabytes :: Int -> Bytes
83+
megabytes mb = Bytes mb * 1000000
8084

8185
segments :: Int -> Bytes
8286
segments s = Bytes s * segmentSize

‎simulation/src/PraosProtocol/Common.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module PraosProtocol.Common (
3232
PraosNodeEvent (..),
3333
PraosConfig (..),
3434
MessageSize (..),
35-
kilobytes,
35+
kibibytes,
3636
module TimeCompat,
3737
defaultPraosConfig,
3838
CPUTask (..),
@@ -55,7 +55,7 @@ import qualified Data.Map.Strict as Map
5555
import Data.Word (Word8)
5656
import GHC.Word (Word64)
5757
import LeiosProtocol.Config (RelayStrategy (RequestFromFirst))
58-
import ModelTCP (kilobytes)
58+
import ModelTCP (kibibytes)
5959
import Ouroboros.Network.Mock.ProducerState as ProducerState
6060
import PraosProtocol.Common.AnchoredFragment (Anchor (..), AnchoredFragment)
6161
import PraosProtocol.Common.Chain (Chain (..), foldChain, pointOnChain)
@@ -180,9 +180,9 @@ defaultPraosConfig =
180180
, blockValidationDelay = const 0.1
181181
, headerValidationDelay = const 0.005
182182
, blockGenerationDelay = const 0
183-
, headerSize = kilobytes 1
184-
, bodySize = const $ kilobytes 95
185-
, bodyMaxSize = kilobytes 96
183+
, headerSize = kibibytes 1
184+
, bodySize = const $ kibibytes 95
185+
, bodyMaxSize = kibibytes 96
186186
, configureConnection = mkConnectionConfig True True
187187
, relayStrategy = RequestFromFirst
188188
}

0 commit comments

Comments
 (0)