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

refactor

Browse source
This commit is contained in:
Joey Hess 2019-06-19 20:19:38 -04:00
parent 26f0f8b20f
commit ba433bdc85
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Annex/Concurrent.hs
View file

@ -118,6 +118,9 @@ changeStageTo mytid tv newstage = liftIO $
where
replaceidle = atomically $ do
pool <- takeTMVar tv
let notchanging = do
putTMVar tv pool
return Nothing
if memberStage newstage (usedStages pool)
then case removeThreadIdWorkerPool mytid pool of
Just ((myaid, oldstage), pool')
@ -132,15 +135,9 @@ changeStageTo mytid tv newstage = liftIO $
addWorkerPool (IdleWorker oldstage) $
addWorkerPool (ActiveWorker myaid newstage) pool''
return $ Just $ Right oldstage
| otherwise -> do
putTMVar tv pool
return Nothing
_ -> do
putTMVar tv pool
return Nothing
else do
putTMVar tv pool
return Nothing
| otherwise -> notchanging
_ -> notchanging
else notchanging
waitidle (myaid, oldstage) = atomically $ do
pool <- waitIdleWorkerSlot newstage =<< takeTMVar tv