voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moar agressive

This commit is contained in:
voidlizard 2024-11-13 19:49:33 +03:00
parent b8baa1528e
commit e61f762913
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbs2-peer/app/BlockDownloadNew.hs
View File

@ -267,7 +267,7 @@ runBurstMachine BurstMachine{..} = do
new <- if e2 > e1 then do new <- if e2 > e1 then do
let d = max 2.0 (current * (1.0 - down)) let d = max 2.0 (current * (1.0 - down))
nrates <- readTVar _rates <&> drop 3 . Map.toList nrates <- readTVar _rates <&> drop 1 . Map.toList
let newFucked = maybe d snd (headMay nrates) let newFucked = maybe d snd (headMay nrates)
writeTVar _rates (Map.fromList nrates) writeTVar _rates (Map.fromList nrates)
pure newFucked pure newFucked
@ -481,7 +481,7 @@ downloadFromPeer t bu cache env h peer = liftIO $ withPeerM env do
let watchdog = fix \next -> do let watchdog = fix \next -> do
wx <- readTVarIO _wx <&> realToFrac wx <- readTVarIO _wx <&> realToFrac
-- debug $ "WATCHDOG" <+> pretty wx <+> pretty waity -- debug $ "WATCHDOG" <+> pretty wx <+> pretty waity
r <- race (pause @'MilliSeconds (min wx waity)) do r <- race (pause @'MilliSeconds wx) do
void $ atomically $ readTQueue chuQ void $ atomically $ readTQueue chuQ
either (const none) (const next) r either (const none) (const next) r
@ -666,7 +666,7 @@ downloadDispatcher brains env = flip runContT pure do
_sizeCache <- newTVarIO ( mempty :: HashMap HashRef (Maybe Integer) ) _sizeCache <- newTVarIO ( mempty :: HashMap HashRef (Maybe Integer) )
bm <- liftIO $ newBurstMachine 5 256 (Just 80) 0.10 0.25 bm <- liftIO $ newBurstMachine 0.5 256 (Just 50) 0.05 0.15
void $ ContT $ bracket none $ const do void $ ContT $ bracket none $ const do
debug $ "Cancelling thread for" <+> pretty p debug $ "Cancelling thread for" <+> pretty p
@ -750,7 +750,7 @@ downloadDispatcher brains env = flip runContT pure do
PInit hx dcb -> do PInit hx dcb -> do
debug $ yellow "Block choosen" <+> pretty p <+> pretty hx trace $ yellow "Block choosen" <+> pretty p <+> pretty hx
hereSize <- readTVarIO _sizeCache <&> HM.lookup hx hereSize <- readTVarIO _sizeCache <&> HM.lookup hx
@ -763,19 +763,19 @@ downloadDispatcher brains env = flip runContT pure do
go (PReleaseBlock hx dcb False) go (PReleaseBlock hx dcb False)
Nothing -> do Nothing -> do
debug $ blue "Query size" <+> pretty p <+> pretty hx trace $ blue "Query size" <+> pretty p <+> pretty hx
go (PQuerySize hx dcb) go (PQuerySize hx dcb)
PQuerySize hx dcb -> do PQuerySize hx dcb -> do
s <- queryBlockSizeFromPeer brains env (coerce hx) p s <- queryBlockSizeFromPeer brains env (coerce hx) p
case s of case s of
Right (Just size) -> do Right (Just size) -> do
debug $ green "HAS BLOCK" <+> pretty p <+> pretty hx <+> pretty size trace $ green "HAS BLOCK" <+> pretty p <+> pretty hx <+> pretty size
atomically $ modifyTVar _sizeCache (HM.insert hx (Just size)) atomically $ modifyTVar _sizeCache (HM.insert hx (Just size))
go (PFetchBlock hx dcb size) go (PFetchBlock hx dcb size)
Right Nothing -> do Right Nothing -> do
debug $ red "HAS NO BLOCK" <+> pretty p <+> pretty hx trace $ red "HAS NO BLOCK" <+> pretty p <+> pretty hx
atomically $ modifyTVar _sizeCache (HM.insert hx Nothing) atomically $ modifyTVar _sizeCache (HM.insert hx Nothing)
go (PReleaseBlock hx dcb False) go (PReleaseBlock hx dcb False)
@ -798,7 +798,7 @@ downloadDispatcher brains env = flip runContT pure do
avg <- readTVarIO _avg avg <- readTVarIO _avg
when (dtsec > avg * 2) do when (dtsec > avg * 1.5) do
burstMachineAddErrors bm 1 burstMachineAddErrors bm 1
atomically do atomically do
@ -820,8 +820,8 @@ downloadDispatcher brains env = flip runContT pure do
if not done then do if not done then do
modifyTVar (dcbBusy dcb) pred modifyTVar (dcbBusy dcb) pred
else do else do
-- modifyTVar (dcbBusy dcb) pred
modifyTVar wip (HM.delete hx) modifyTVar wip (HM.delete hx)
go PChoose
bs <- ContT $ withAsync $ forever do bs <- ContT $ withAsync $ forever do
pause @'Seconds 10 pause @'Seconds 10