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

avoid leaving MVar empty

Browse source 
Something might want to observe the code multiple times.
This commit is contained in:
Joey Hess 2016-12-27 16:26:26 -04:00
parent 9e0aae036b
commit 41d956e0a0
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/MagicWormhole.hs
View file

@ -78,7 +78,7 @@ mkCodeProducer :: IO CodeProducer
mkCodeProducer = CodeProducer <$> newEmptyMVar mkCodeProducer = CodeProducer <$> newEmptyMVar
waitCode :: CodeObserver -> IO Code waitCode :: CodeObserver -> IO Code
waitCode (CodeObserver o) = takeMVar o waitCode (CodeObserver o) = readMVar o
sendCode :: CodeProducer -> Code -> IO () sendCode :: CodeProducer -> Code -> IO ()
sendCode (CodeProducer p) = putMVar p sendCode (CodeProducer p) = putMVar p
@ -119,7 +119,7 @@ sendFile f (CodeObserver observer) ps = do
-- read from the CodeProducer, and fed to wormhole on stdin. -- read from the CodeProducer, and fed to wormhole on stdin.
receiveFile :: FilePath -> CodeProducer -> WormHoleParams -> IO Bool receiveFile :: FilePath -> CodeProducer -> WormHoleParams -> IO Bool
receiveFile f (CodeProducer producer) ps = runWormHoleProcess p $ \hin _hout -> do receiveFile f (CodeProducer producer) ps = runWormHoleProcess p $ \hin _hout -> do
Code c <- takeMVar producer Code c <- readMVar producer
hPutStrLn hin c hPutStrLn hin c
hFlush hin hFlush hin
return True return True