mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

forgot to update the tchan when dequeuing transfers

Browse source
This commit is contained in:
Joey Hess 2012-08-29 15:46:42 -04:00
parent a4fa31ffa1
commit 0842e99637
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Assistant/TransferQueue.hs
View file

@ -145,11 +145,15 @@ getNextTransfer q dstatus acceptable = atomically $ do
dequeueTransfer :: TransferQueue -> DaemonStatusHandle -> Transfer -> IO Bool dequeueTransfer :: TransferQueue -> DaemonStatusHandle -> Transfer -> IO Bool
dequeueTransfer q dstatus t = do dequeueTransfer q dstatus t = do
ok <- atomically $ do ok <- atomically $ do
(removed, l) <- partition (equivilantTransfer t . fst) (removed, ls) <- partition (equivilantTransfer t . fst)
<$> readTVar (queuelist q) <$> readTVar (queuelist q)
void $ writeTVar (queuesize q) (length l) void $ writeTVar (queuesize q) (length ls)
void $ writeTVar (queuelist q) l void $ writeTVar (queuelist q) ls
drain
forM_ ls $ unGetTChan (queue q)
return $ not $ null removed return $ not $ null removed
when ok $ when ok $
notifyTransfer dstatus notifyTransfer dstatus
return ok return ok
where
drain = maybe noop (const drain) =<< tryReadTChan (queue q)