From e1c071f86e804dc54f455b64423dacff9e6c40aa Mon Sep 17 00:00:00 2001 From: voidlizard Date: Sun, 3 Nov 2024 20:49:59 +0300 Subject: [PATCH] tune --- hbs2-core/lib/HBS2/Defaults.hs | 4 ++-- hbs2-core/lib/HBS2/Net/Messaging/TCP.hs | 4 ++-- hbs2-peer/app/BlockDownload.hs | 8 ++++---- hbs2-storage-simple/lib/HBS2/Storage/Simple.hs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hbs2-core/lib/HBS2/Defaults.hs b/hbs2-core/lib/HBS2/Defaults.hs index 94dc4027..e25fd041 100644 --- a/hbs2-core/lib/HBS2/Defaults.hs +++ b/hbs2-core/lib/HBS2/Defaults.hs @@ -70,14 +70,14 @@ defBlockWipTimeout :: TimeSpec defBlockWipTimeout = defCookieTimeout defBlockInfoTimeout :: Timeout 'Seconds -defBlockInfoTimeout = 5 +defBlockInfoTimeout = 2 defBlockInfoTimeoutSpec :: TimeSpec defBlockInfoTimeoutSpec = toTimeSpec defBlockInfoTimeout -- how much time wait for block from peer? defBlockWaitMax :: Timeout 'Seconds -defBlockWaitMax = 60 :: Timeout 'Seconds +defBlockWaitMax = 30 :: Timeout 'Seconds -- how much time wait for block from peer? defChunkWaitMax :: Timeout 'Seconds diff --git a/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs b/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs index e541277c..ed6c92c1 100644 --- a/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs +++ b/hbs2-core/lib/HBS2/Net/Messaging/TCP.hs @@ -51,7 +51,7 @@ import Streaming.Prelude qualified as S -- FIXME: control-recv-capacity-to-avoid-leaks outMessageQLen :: Natural -outMessageQLen = 256 +outMessageQLen = 1024*32 -- | TCP Messaging environment data MessagingTCP = @@ -106,7 +106,7 @@ newMessagingTCP pa = liftIO do <*> newTVarIO mempty <*> newTVarIO mempty <*> newTQueueIO - <*> newTBQueueIO outMessageQLen + <*> newTBQueueIO (10 * outMessageQLen) <*> newTVarIO mempty <*> newTVarIO 0 <*> newTVarIO mempty diff --git a/hbs2-peer/app/BlockDownload.hs b/hbs2-peer/app/BlockDownload.hs index e7c08360..bd70a2b4 100644 --- a/hbs2-peer/app/BlockDownload.hs +++ b/hbs2-peer/app/BlockDownload.hs @@ -320,8 +320,8 @@ blockDownloadLoop env0 = do e <- ask sto <- getStorage - let downT = 8 - let sizeT = 1 + let downT = 16 + let sizeT = 16 inQ <- withDownload env0 $ asks (view blockInQ) checkQ <- withDownload env0 $ asks (view blockCheckQ) @@ -677,8 +677,8 @@ blockDownloadLoop env0 = do updateRates e rates nonces = withPeerM e do let wRtt = 5 - let wUdp = 1.5 - let wTcp = 1.1 + let wUdp = 1.75 + let wTcp = 0.95 let wS = 1.5 let eps = 1e-8 diff --git a/hbs2-storage-simple/lib/HBS2/Storage/Simple.hs b/hbs2-storage-simple/lib/HBS2/Storage/Simple.hs index dd212c73..1e657f16 100644 --- a/hbs2-storage-simple/lib/HBS2/Storage/Simple.hs +++ b/hbs2-storage-simple/lib/HBS2/Storage/Simple.hs @@ -145,7 +145,7 @@ simpleStorageInit opts = liftIO $ do <*> TV.newTVarIO False <*> TV.newTVarIO mempty <*> TV.newTVarIO mempty - <*> Cache.newCache (Just (toTimeSpec (10 :: Timeout 'Seconds))) + <*> Cache.newCache (Just (toTimeSpec (60 :: Timeout 'Seconds))) createDirectoryIfMissing True (stor ^. storageBlocks) createDirectoryIfMissing True (stor ^. storageTemp)