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

wip, race fixed?

This commit is contained in:
voidlizard 2025-07-13 17:15:59 +03:00
parent 15bec48522
commit a87b2a11fa
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ type NCQSize = Word32
type StateVersion = Word64 type StateVersion = Word64
data StateOP = D FileKey | F TimeSpec FileKey data StateOP = D FileKey | F TimeSpec FileKey | P FileKey
deriving (Eq,Ord,Show) deriving (Eq,Ord,Show)
data NCQFlag = data NCQFlag =
@ -473,10 +473,9 @@ ncqStorageRun2 ncq@NCQStorage2{..} = flip runContT pure do
else do else do
appendTailSection fh >> liftIO (fileSynchronise fh) appendTailSection fh >> liftIO (fileSynchronise fh)
-- FIXME: slow! -- FIXME: slow!
-- liftIO (ncqStateUpdate ncq [F 0 fk]) -- to make it appear in state, but to ignore until index is done
liftIO (ncqStateUpdate ncq [P fk])
atomically do atomically do
-- to make it appear in state, but to ignore until indexed
modifyTVar ncqTrackedFiles (HPSQ.insert fk (FilePrio (Down 0)) (Just PendingEntry))
writeTVar ncqStorageSyncReq False writeTVar ncqStorageSyncReq False
modifyTVar' ncqSyncNo succ modifyTVar' ncqSyncNo succ
@ -859,6 +858,13 @@ ncqStateUpdate me@NCQStorage2{..} ops' = flip runContT pure $ callCC \exit -> do
for_ ops $ \case for_ ops $ \case
D fk -> modifyTVar' ncqTrackedFiles (HPSQ.delete fk) D fk -> modifyTVar' ncqTrackedFiles (HPSQ.delete fk)
F t fk -> ncqAddTrackedFileSTM me (coerce fk) t F t fk -> ncqAddTrackedFileSTM me (coerce fk) t
P fk -> do
let onlyIfMissed = \case
Nothing -> ((), Just (FilePrio (Down 0), Just PendingEntry))
Just (p,v) -> ((), Just (p,v))
modifyTVar' ncqTrackedFiles (snd . HPSQ.alter onlyIfMissed fk)
pure True pure True
old <- readTVar ncqTrackedFiles <&> HS.fromList . HPSQ.keys old <- readTVar ncqTrackedFiles <&> HS.fromList . HPSQ.keys