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

async exception safety

Browse source
This commit is contained in:
Joey Hess 2020-06-05 14:42:11 -04:00
parent 660d8d3a87
commit a477f7253c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
P2P/IO.hs
View file

@ -272,15 +272,17 @@ runRelay runner (RelayHandle hout) (RelayHandle hin) =
where where
setup = do setup = do
v <- newEmptyMVar v <- newEmptyMVar
void $ async $ relayFeeder runner v hin t1 <- async $ relayFeeder runner v hin
void $ async $ relayReader v hout t2 <- async $ relayReader v hout
return v return (v, t1, t2)
cleanup _ = do cleanup (_, t1, t2) = do
hClose hin hClose hin
hClose hout hClose hout
cancel t1
cancel t2
go v = relayHelper runner v go (v, _, _) = relayHelper runner v
runRelayService :: P2PConnection -> RunProto IO -> Service -> IO (Either ProtoFailure ()) runRelayService :: P2PConnection -> RunProto IO -> Service -> IO (Either ProtoFailure ())
runRelayService conn runner service = runRelayService conn runner service =