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

wip, faster putBlock

This commit is contained in:
voidlizard 2025-08-14 12:57:58 +03:00
parent 56d71cb988
commit 59a54fabb8
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal.hs
View File

@ -46,6 +46,8 @@ ncqStorageOpen fp upd = do
let shardNum = fromIntegral cap let shardNum = fromIntegral cap
let wopNum = 2 let wopNum = 2
let !ncqReadThreads = wopNum * 4
ncqWriteQ <- newTVarIO mempty ncqWriteQ <- newTVarIO mempty
ncqMemTable <- V.fromList <$> replicateM shardNum (newTVarIO mempty) ncqMemTable <- V.fromList <$> replicateM shardNum (newTVarIO mempty)
ncqMMapCachedIdx <- newTVarIO HPSQ.empty ncqMMapCachedIdx <- newTVarIO HPSQ.empty

2
hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Run.hs
View File

@ -56,7 +56,7 @@ ncqStorageRun ncq@NCQStorage{..} = flip runContT pure do
let q = ncqWriteOps ! i let q = ncqWriteOps ! i
forever (liftIO $ join $ atomically (readTQueue q)) forever (liftIO $ join $ atomically (readTQueue q))
replicateM_ 2 $ spawnActivity $ forever $ flip runContT pure $ callCC \exit -> do replicateM_ ncqReadThreads $ spawnActivity $ forever $ flip runContT pure $ callCC \exit -> do
(h, answ) <- atomically $ readTQueue ncqReadReq (h, answ) <- atomically $ readTQueue ncqReadReq
let answer l = atomically (putTMVar answ l) let answer l = atomically (putTMVar answ l)

1
hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Types.hs
View File

@ -85,6 +85,7 @@ data NCQStorage =
, ncqMaxLog :: Int , ncqMaxLog :: Int
, ncqMaxCachedIndex :: Int , ncqMaxCachedIndex :: Int
, ncqMaxCachedData :: Int , ncqMaxCachedData :: Int
, ncqReadThreads :: Int
, ncqIdleThrsh :: Double , ncqIdleThrsh :: Double
, ncqMMapCachedIdx :: TVar (HashPSQ FileKey CachePrio CachedIndex) , ncqMMapCachedIdx :: TVar (HashPSQ FileKey CachePrio CachedIndex)
, ncqMMapCachedData :: TVar (HashPSQ FileKey CachePrio CachedData) , ncqMMapCachedData :: TVar (HashPSQ FileKey CachePrio CachedData)

3
hbs2-tests/test/NCQ3.hs
View File

@ -606,8 +606,9 @@ ncq3Tests = do
chu <- S.toList_ (readChunkedBS lbs (256*1024)) chu <- S.toList_ (readChunkedBS lbs (256*1024))
hashes <- forConcurrently chu $ \chunk -> do hashes <- forConcurrently chu $ \chunk -> do
-- ncqPutBS ncq (Just B) Nothing (LBS.toStrict chunk)
ncqTossBlock ncq chunk >>= orThrowUser "can't save" ncqTossBlock ncq chunk >>= orThrowUser "can't save"
-- ncqPutBlock ncq chunk
-- ncqPutBS ncq (Just B) Nothing (LBS.toStrict chunk
none none