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

fix build with old base

Browse source 
Old base (used on android still) lacks tryReadMVar
This commit is contained in:
Joey Hess 2018-03-16 12:06:45 -04:00
parent fd76a558ba
commit 2c05bc9dfd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Utility/Metered.hs
View file

@ -295,7 +295,7 @@ rateLimitMeterUpdate delta (Meter totalsizev _ _ _) meterupdate = do
lastupdate <- newMVar (toEnum 0 :: POSIXTime) lastupdate <- newMVar (toEnum 0 :: POSIXTime)
return $ mu lastupdate return $ mu lastupdate
where where
mu lastupdate n@(BytesProcessed i) = tryReadMVar totalsizev >>= \case mu lastupdate n@(BytesProcessed i) = readMVar totalsizev >>= \case
Just t | i >= t -> meterupdate n Just t | i >= t -> meterupdate n
_ -> do _ -> do
now <- getPOSIXTime now <- getPOSIXTime
@ -306,7 +306,7 @@ rateLimitMeterUpdate delta (Meter totalsizev _ _ _) meterupdate = do
meterupdate n meterupdate n
else putMVar lastupdate prev else putMVar lastupdate prev
data Meter = Meter (MVar Integer) (MVar MeterState) (MVar String) DisplayMeter data Meter = Meter (MVar (Maybe Integer)) (MVar MeterState) (MVar String) DisplayMeter
type MeterState = (BytesProcessed, POSIXTime) type MeterState = (BytesProcessed, POSIXTime)
@ -317,15 +317,13 @@ type RenderMeter = Maybe Integer -> (BytesProcessed, POSIXTime) -> (BytesProcess
-- | Make a meter. Pass the total size, if it's known. -- | Make a meter. Pass the total size, if it's known.
mkMeter :: Maybe Integer -> DisplayMeter -> IO Meter mkMeter :: Maybe Integer -> DisplayMeter -> IO Meter
mkMeter totalsize displaymeter = Meter mkMeter totalsize displaymeter = Meter
<$> maybe newEmptyMVar newMVar totalsize <$> newMVar totalsize
<*> ((\t -> newMVar (zeroBytesProcessed, t)) =<< getPOSIXTime) <*> ((\t -> newMVar (zeroBytesProcessed, t)) =<< getPOSIXTime)
<*> newMVar "" <*> newMVar ""
<*> pure displaymeter <*> pure displaymeter
setMeterTotalSize :: Meter -> Integer -> IO () setMeterTotalSize :: Meter -> Integer -> IO ()
setMeterTotalSize (Meter totalsizev _ _ _) totalsize = do setMeterTotalSize (Meter totalsizev _ _ _) = void . swapMVar totalsizev . Just
void $ tryTakeMVar totalsizev
putMVar totalsizev totalsize
-- | Updates the meter, displaying it if necessary. -- | Updates the meter, displaying it if necessary.
updateMeter :: Meter -> BytesProcessed -> IO () updateMeter :: Meter -> BytesProcessed -> IO ()
@ -333,7 +331,7 @@ updateMeter (Meter totalsizev sv bv displaymeter) new = do
now <- getPOSIXTime now <- getPOSIXTime
(old, before) <- swapMVar sv (new, now) (old, before) <- swapMVar sv (new, now)
when (old /= new) $ do when (old /= new) $ do
totalsize <- tryReadMVar totalsizev totalsize <- readMVar totalsizev
displaymeter bv totalsize (old, before) (new, now) displaymeter bv totalsize (old, before) (new, now)
-- | Display meter to a Handle. -- | Display meter to a Handle.