From 5b9c1a301d765625b6db75e097cb2e8a37c0eeaa Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Sun, 26 Feb 2023 14:49:37 +0300 Subject: [PATCH] minor fix --- hbs2-core/lib/HBS2/Defaults.hs | 2 +- hbs2-peer/app/BlockDownload.hs | 5 +++-- hbs2-peer/app/PeerTypes.hs | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbs2-core/lib/HBS2/Defaults.hs b/hbs2-core/lib/HBS2/Defaults.hs index e3c3b4e3..02217d03 100644 --- a/hbs2-core/lib/HBS2/Defaults.hs +++ b/hbs2-core/lib/HBS2/Defaults.hs @@ -63,7 +63,7 @@ defBlockBanTimeSec :: Timeout 'Seconds defBlockBanTimeSec = 60 :: Timeout 'Seconds defBlockWipTimeout :: TimeSpec -defBlockWipTimeout = defBlockSizeCacheTime +defBlockWipTimeout = defCookieTimeout defBlockInfoTimeout :: Timeout 'Seconds defBlockInfoTimeout = 1 diff --git a/hbs2-peer/app/BlockDownload.hs b/hbs2-peer/app/BlockDownload.hs index a8e68445..8faa35ec 100644 --- a/hbs2-peer/app/BlockDownload.hs +++ b/hbs2-peer/app/BlockDownload.hs @@ -480,7 +480,6 @@ blockDownloadLoop env0 = do tinfo <- asks (view blockPeers) binfo <- liftIO $ readTVarIO tinfo wip <- asks (view blockWip) - wipCnt <- asks (view blocksWipCnt) >>= liftIO . readTVarIO liftIO $ Cache.purgeExpired wip @@ -495,7 +494,9 @@ blockDownloadLoop env0 = do po <- asks (view peerPostponed) >>= liftIO . readTVarIO - notice $ "maintain blocks wip" <+> pretty wipCnt + wipNum <- liftIO $ Cache.size wip + + notice $ "maintain blocks wip" <+> pretty wipNum <+> "postponed" <+> pretty (HashMap.size po) diff --git a/hbs2-peer/app/PeerTypes.hs b/hbs2-peer/app/PeerTypes.hs index 1596b6e9..8bd6d4ab 100644 --- a/hbs2-peer/app/PeerTypes.hs +++ b/hbs2-peer/app/PeerTypes.hs @@ -294,7 +294,6 @@ addDownload h = do liftIO do atomically $ do modifyTVar tinq $ HashMap.insert h () - modifyTVar wipCnt succ writeTQueue q h Cache.insert wip h ()