From f22410ba81455050bbae71ec6b81ae94b890d13e Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Mon, 20 Feb 2023 10:46:42 +0300 Subject: [PATCH] q only --- hbs2-core/lib/HBS2/Net/Messaging/UDP.hs | 15 +++++++-------- hbs2-peer/app/BlockDownload.hs | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hbs2-core/lib/HBS2/Net/Messaging/UDP.hs b/hbs2-core/lib/HBS2/Net/Messaging/UDP.hs index f43b1754..f81b7124 100644 --- a/hbs2-core/lib/HBS2/Net/Messaging/UDP.hs +++ b/hbs2-core/lib/HBS2/Net/Messaging/UDP.hs @@ -140,10 +140,10 @@ udpWorker env tso = do rcvLoop <- async $ forever $ do -- so <- readTVarIO tso - pause ( 10 :: Timeout 'Seconds ) - -- (msg, from) <- recvFrom so defMaxDatagram + -- pause ( 10 :: Timeout 'Seconds ) + (msg, from) <- recvFrom so defMaxDatagram -- liftIO $ print $ "recv:" <+> pretty (BS.length msg) - -- atomically $ Q.writeTBQueue (sink env) (From (PeerUDP from), LBS.fromStrict msg) + liftIO $ atomically $ Q.writeTBQueue (sink env) (From (PeerUDP from), LBS.fromStrict msg) sndLoop <- async $ forever $ do pause ( 10 :: Timeout 'Seconds ) @@ -178,10 +178,9 @@ instance Messaging MessagingUDP UDP ByteString where sendAllTo so (LBS.toStrict msg) (view sockAddr whom) receive bus _ = liftIO do - so <- readTVarIO (sock bus) - (msg, from) <- recvFrom so defMaxDatagram - pure [(From (PeerUDP from), LBS.fromStrict msg)] + -- so <- readTVarIO (sock bus) + -- (msg, from) <- recvFrom so defMaxDatagram + -- pure [(From (PeerUDP from), LBS.fromStrict msg)] - -- liftIO $ atomically - -- $ Q.readTBQueue (sink bus) <&> L.singleton + liftIO $ atomically $ Q.readTBQueue (sink bus) <&> L.singleton diff --git a/hbs2-peer/app/BlockDownload.hs b/hbs2-peer/app/BlockDownload.hs index 12a667d9..229f71b2 100644 --- a/hbs2-peer/app/BlockDownload.hs +++ b/hbs2-peer/app/BlockDownload.hs @@ -382,7 +382,7 @@ updatePeerInfo onError pinfo = do let buM = headMay $ drop 2 $ IntSet.toDescList buSet writeTVar (view peerBurstMax pinfo) buM -- let s = IntSet.size buSet - let buN = headDef defBurst $ drop 10 $ IntSet.toDescList buSet + let buN = headDef defBurst $ drop 4 $ IntSet.toDescList buSet pure (buN, trimDown 50 $ IntSet.insert buN buSet)