From f27cfbfabba7dcee428f8746011af832c15ae24d Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Sat, 1 Apr 2023 10:36:56 +0300 Subject: [PATCH] rtt --- hbs2-core/lib/HBS2/Defaults.hs | 15 +++++++-------- hbs2-core/lib/HBS2/Net/Proto/Definition.hs | 2 +- hbs2-core/lib/HBS2/Net/Proto/Peer.hs | 2 +- hbs2-core/lib/HBS2/Net/Proto/PeerExchange.hs | 3 +-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hbs2-core/lib/HBS2/Defaults.hs b/hbs2-core/lib/HBS2/Defaults.hs index 53c5a21b..db2226ae 100644 --- a/hbs2-core/lib/HBS2/Defaults.hs +++ b/hbs2-core/lib/HBS2/Defaults.hs @@ -13,14 +13,15 @@ defMessageQueueSize :: Integral a => a defMessageQueueSize = 65536*10 defBurst :: Integral a => a -defBurst = 4 +defBurst = 8 defBurstMax :: Integral a => a defBurstMax = 64 -- defChunkSize :: Integer defChunkSize :: Integral a => a -defChunkSize = 1200 +defChunkSize = 1400 +-- defChunkSize = 480 defBlockSize :: Integer defBlockSize = 256 * 1024 @@ -69,21 +70,21 @@ defBlockWipTimeout :: TimeSpec defBlockWipTimeout = defCookieTimeout defBlockInfoTimeout :: Timeout 'Seconds -defBlockInfoTimeout = 5 +defBlockInfoTimeout = 60 defBlockInfoTimeoutSpec :: TimeSpec defBlockInfoTimeoutSpec = toTimeSpec defBlockInfoTimeout -- how much time wait for block from peer? defBlockWaitMax :: Timeout 'Seconds -defBlockWaitMax = 5 :: Timeout 'Seconds +defBlockWaitMax = 120 :: Timeout 'Seconds -- how much time wait for block from peer? defChunkWaitMax :: Timeout 'Seconds -defChunkWaitMax = 3 :: Timeout 'Seconds +defChunkWaitMax = 60 :: Timeout 'Seconds defSweepTimeout :: Timeout 'Seconds -defSweepTimeout = 30 -- FIXME: only for debug! +defSweepTimeout = 60 -- FIXME: only for debug! defPeerAnnounceTime :: Timeout 'Seconds defPeerAnnounceTime = 120 @@ -106,6 +107,4 @@ defUsefulLimit = 0.25 defInterBlockDelay :: Timeout 'Seconds defInterBlockDelay = 0.0085 -defBlockReqNum :: Integral a => a -defBlockReqNum = 2 diff --git a/hbs2-core/lib/HBS2/Net/Proto/Definition.hs b/hbs2-core/lib/HBS2/Net/Proto/Definition.hs index 280b0346..b1a95d53 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/Definition.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/Definition.hs @@ -128,7 +128,7 @@ instance Expires (SessionKey UDP (KnownPeer UDP)) where expiresIn _ = Just 3600 instance Expires (SessionKey UDP (PeerHandshake UDP)) where - expiresIn _ = Just 10 + expiresIn _ = Just 60 instance Expires (EventKey UDP (PeerAnnounce UDP)) where expiresIn _ = Nothing diff --git a/hbs2-core/lib/HBS2/Net/Proto/Peer.hs b/hbs2-core/lib/HBS2/Net/Proto/Peer.hs index 9c2e6f03..df825f65 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/Peer.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/Peer.hs @@ -172,7 +172,7 @@ instance Expires (EventKey e (PeerHandshake e)) where expiresIn _ = Nothing instance Expires (EventKey e (ConcretePeer e)) where - expiresIn _ = Just 10 + expiresIn _ = Just 60 instance Hashable (Peer e) => Hashable (EventKey e (PeerHandshake e)) diff --git a/hbs2-core/lib/HBS2/Net/Proto/PeerExchange.hs b/hbs2-core/lib/HBS2/Net/Proto/PeerExchange.hs index 9ec42e1b..70b3f0c0 100644 --- a/hbs2-core/lib/HBS2/Net/Proto/PeerExchange.hs +++ b/hbs2-core/lib/HBS2/Net/Proto/PeerExchange.hs @@ -110,8 +110,7 @@ deriving instance Eq (Nonce (PeerExchange e)) => Eq (SessionKey e (PeerExchange instance Hashable (Nonce (PeerExchange e)) => Hashable (SessionKey e (PeerExchange e)) instance Expires (SessionKey e (PeerExchange e)) where - expiresIn _ = Just 10 - + expiresIn _ = Just 60 instance Typeable (PeerExchangePeersEv e) => Hashable (EventKey e (PeerExchangePeersEv e)) where