remove now-unnecessary manual reaps

This commit is contained in:
Joey Hess 2012-10-04 18:57:53 -04:00
parent 5594bf0643
commit de3ea4adb6
4 changed files with 7 additions and 3 deletions

View file

@ -69,6 +69,7 @@ start :: M.Map UUID String -> TimeZone -> [CommandParam] -> Bool ->
FilePath -> (Key, Backend) -> CommandStart
start m zone os gource file (key, _) = do
showLog output =<< readLog <$> getLog key os
-- getLog produces a zombie; reap it
liftIO Git.Command.reap
stop
where

View file

@ -93,7 +93,11 @@ pipeNullSplit params repo = do
pipeNullSplitZombie :: [CommandParam] -> Repo -> IO [String]
pipeNullSplitZombie params repo = fst <$> pipeNullSplit params repo
{- Reaps any zombie git processes. -}
{- Reaps any zombie git processes.
-
- Warning: Not thread safe. Anything that was expecting to wait
- on a process and get back an exit status is going to be confused
- if this reap gets there first. -}
reap :: IO ()
reap = do
-- throws an exception when there are no child processes

View file

@ -39,7 +39,6 @@ hashFile h file = CoProcess.query h send receive
hashObject :: ObjectType -> String -> Repo -> IO Sha
hashObject objtype content repo = getSha subcmd $ do
s <- pipeWriteRead (map Param params) content repo
reap -- XXX unsure why this is needed, of if it is anymore
return s
where
subcmd = "hash-object"

View file

@ -212,7 +212,7 @@ onLocal r a = do
-- No need to update the branch; its data is not used
-- for anything onLocal is used to do.
Annex.BranchState.disableUpdate
liftIO Git.Command.reap `after` a
a
keyUrls :: Git.Repo -> Key -> [String]
keyUrls r key = map tourl (annexLocations key)