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

wip

This commit is contained in:
voidlizard 2025-07-11 15:06:30 +03:00
parent 9b123448f4
commit 4f5842ef7f
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hbs2-storage-ncq/lib/HBS2/Storage/NCQ2.hs
View File

@ -157,19 +157,19 @@ ncqStorageOpen2 fp upd = do
let ncqMaxCached = 128 let ncqMaxCached = 128
let ncqIdleThrsh = 50.00 let ncqIdleThrsh = 50.00
cap <- getNumCapabilities <&> fromIntegral cap <- getNumCapabilities <&> fromIntegral
ncqWriteQ <- newTVarIO mempty ncqWriteQ <- newTVarIO mempty
ncqWriteSem <- atomically $ newTSem 16 -- (fromIntegral cap) ncqWriteSem <- atomically $ newTSem 16 -- (fromIntegral cap)
ncqMemTable <- V.fromList <$> replicateM cap (newTVarIO mempty) ncqMemTable <- V.fromList <$> replicateM cap (newTVarIO mempty)
ncqStorageStopReq <- newTVarIO False ncqStorageStopReq <- newTVarIO False
ncqStorageSyncReq <- newTVarIO False ncqStorageSyncReq <- newTVarIO False
ncqSyncNo <- newTVarIO 0 ncqSyncNo <- newTVarIO 0
ncqTrackedFiles <- newTVarIO HPSQ.empty ncqTrackedFiles <- newTVarIO HPSQ.empty
ncqCachedEntries <- newTVarIO 0 ncqCachedEntries <- newTVarIO 0
ncqStorageTasks <- newTVarIO 0 ncqStorageTasks <- newTVarIO 0
ncqWrites <- newTVarIO 0 ncqWrites <- newTVarIO 0
ncqWriteEMA <- newTVarIO 0.00 ncqWriteEMA <- newTVarIO 0.00
ncqJobQ <- newTQueueIO ncqJobQ <- newTQueueIO
let ncqSalt = "EstEFasxrCFqsGDxcY4haFcha9e4ZHRzsPbGUmDfdxLk" let ncqSalt = "EstEFasxrCFqsGDxcY4haFcha9e4ZHRzsPbGUmDfdxLk"
@ -281,9 +281,13 @@ ncqLocate2 ncq@NCQStorage2{..} href = flip runContT pure $ callCC \exit -> do
-- atomically $ modifyTVar' ncqWrites succ -- atomically $ modifyTVar' ncqWrites succ
-- FIXME: race
-- merge can-delete-file-while-in-use
tracked <- readTVarIO ncqTrackedFiles <&> HPSQ.toList tracked <- readTVarIO ncqTrackedFiles <&> HPSQ.toList
for_ tracked $ \(fk, prio, mCached) -> case mCached of for_ tracked $ \(fk, prio, mCached) -> do
case mCached of
Just CachedEntry{..} -> do Just CachedEntry{..} -> do
lookupEntry href (cachedMmapedIdx, cachedNway) >>= \case lookupEntry href (cachedMmapedIdx, cachedNway) >>= \case
Nothing -> none Nothing -> none
@ -713,6 +717,8 @@ ncqWaitTasks NCQStorage2{..} = atomically do
tno <- readTVar ncqStorageTasks tno <- readTVar ncqStorageTasks
when (tno > 0) STM.retry when (tno > 0) STM.retry
-- FIXME: sometime-causes-no-such-file-or-directory
ncqStorageMergeStep :: MonadUnliftIO m => NCQStorage2 -> m Bool ncqStorageMergeStep :: MonadUnliftIO m => NCQStorage2 -> m Bool
ncqStorageMergeStep ncq@NCQStorage2{..} = ncqRunTask ncq False $ flip runContT pure do ncqStorageMergeStep ncq@NCQStorage2{..} = ncqRunTask ncq False $ flip runContT pure do