From ad6871bca1c512768124cbef9bcdbfa43402d38f Mon Sep 17 00:00:00 2001
From: voidlizard <dzuikov@gmail.com>
Date: Thu, 14 Nov 2024 10:46:49 +0300
Subject: [PATCH] wip

---
 hbs2-peer/app/BlockDownloadNew.hs | 5 +----
 hbs2-peer/app/PeerInfo.hs         | 2 +-
 hbs2-peer/app/PeerMain.hs         | 2 +-
 hbs2-peer/app/PeerTypes.hs        | 4 ----
 hbs2-peer/app/RPC2.hs             | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/hbs2-peer/app/BlockDownloadNew.hs b/hbs2-peer/app/BlockDownloadNew.hs
index 98141122..fb17ae15 100644
--- a/hbs2-peer/app/BlockDownloadNew.hs
+++ b/hbs2-peer/app/BlockDownloadNew.hs
@@ -562,13 +562,10 @@ downloadDispatcher :: forall e m . ( e ~ L4Proto
 downloadDispatcher brains env = flip runContT pure do
 
   pts   <- newTVarIO ( mempty :: HashMap (Peer e) (Async (), PeerNonce) )
-  -- tasks <- newTVarIO ( HPSQ.empty :: HashPSQ (Work e) Double (TVar Int) )
 
-  _blkNum   <- newTVarIO 0
   wip       <- newTVarIO ( mempty :: HashMap HashRef DCB )
   parseQ    <- newTQueueIO
 
-
   let
     onBlockSTM :: HashRef -> STM ()
     onBlockSTM = writeTQueue parseQ
@@ -745,7 +742,7 @@ downloadDispatcher brains env = flip runContT pure do
           down <- readTVar _blknum
           writeTVar _peerErrorsLast erno
           writeTVar _peerBurst bu
-          writeTVar _peerDownloadedLast down
+          writeTVar _peerDownloaded down
 
       rndGen <- liftIO newStdGen >>= newTVarIO
 
diff --git a/hbs2-peer/app/PeerInfo.hs b/hbs2-peer/app/PeerInfo.hs
index b9ef5dbd..a31cb94e 100644
--- a/hbs2-peer/app/PeerInfo.hs
+++ b/hbs2-peer/app/PeerInfo.hs
@@ -194,7 +194,7 @@ peerPingLoop (PeerConfig syn) penv = do
         burst  <- liftIO $ readTVarIO (view peerBurst pinfo)
         errors <- liftIO $ readTVarIO (view peerErrorsPerSec pinfo)
         downMiss  <- liftIO $ readTVarIO (view peerDownloadMiss pinfo)
-        down      <- liftIO $ readTVarIO (view peerDownloadedBlk pinfo)
+        down      <- liftIO $ readTVarIO (view peerDownloaded pinfo)
         rtt       <- liftIO $ medianPeerRTT pinfo <&> fmap realToFrac
         httpDownloaded <- liftIO $ readTVarIO (_peerHttpDownloaded pinfo)
         seen      <- liftIO $ readTVarIO (view peerLastWatched pinfo)
diff --git a/hbs2-peer/app/PeerMain.hs b/hbs2-peer/app/PeerMain.hs
index 9657aeea..995b3ecf 100644
--- a/hbs2-peer/app/PeerMain.hs
+++ b/hbs2-peer/app/PeerMain.hs
@@ -143,7 +143,7 @@ instance Exception GoAgainException
 
 -- TODO: write-workers-to-config
 defStorageThreads :: Integral a => a
-defStorageThreads = 4
+defStorageThreads = 8
 
 defLocalMulticast :: String
 defLocalMulticast = "239.192.152.145:10153"
diff --git a/hbs2-peer/app/PeerTypes.hs b/hbs2-peer/app/PeerTypes.hs
index 22e429fd..f076077e 100644
--- a/hbs2-peer/app/PeerTypes.hs
+++ b/hbs2-peer/app/PeerTypes.hs
@@ -74,9 +74,7 @@ data PeerInfo e =
   , _peerErrorsPerSec   :: TVar Int
   , _peerLastWatched    :: TVar TimeSpec
   , _peerDownloaded     :: TVar Int
-  , _peerDownloadedLast :: TVar Int
   , _peerPingFailed     :: TVar Int
-  , _peerDownloadedBlk  :: TVar Int
   , _peerDownloadFail   :: TVar Int
   , _peerDownloadMiss   :: TVar Int
   , _peerRTTBuffer      :: TVar [Integer] -- ^ Contains a list of the last few round-trip time (RTT) values, measured in nanoseconds.
@@ -99,9 +97,7 @@ newPeerInfo = liftIO do
   _peerErrorsPerSec   <- newTVarIO 0
   _peerLastWatched    <- newTVarIO 0
   _peerDownloaded     <- newTVarIO 0
-  _peerDownloadedLast <- newTVarIO 0
   _peerPingFailed     <- newTVarIO 0
-  _peerDownloadedBlk  <- newTVarIO 0
   _peerDownloadFail   <- newTVarIO 0
   _peerDownloadMiss   <- newTVarIO 0
   _peerRTTBuffer      <- newTVarIO []
diff --git a/hbs2-peer/app/RPC2.hs b/hbs2-peer/app/RPC2.hs
index aa55a823..eb560493 100644
--- a/hbs2-peer/app/RPC2.hs
+++ b/hbs2-peer/app/RPC2.hs
@@ -231,7 +231,7 @@ instance (e ~ L4Proto, MonadUnliftIO m, HasRpcContext PeerAPI RPC2Context m) =>
               errors    <- readTVarIO _peerErrorsPerSec
               downFails <- readTVarIO _peerDownloadFail
               downMiss  <- readTVarIO _peerDownloadMiss
-              down      <- readTVarIO _peerDownloadedBlk
+              down      <- readTVarIO _peerDownloaded
               rtt       <- medianPeerRTT pinfo <&> fmap realToFrac
               seen      <- readTVarIO _peerLastWatched
               let l = realToFrac (toNanoSecs $ now - seen) / 1e9