convert to withCreateProcess for async exception safety
This handles all createProcessSuccess callers, and aside from process pools, the complete conversion of all process running to async exception safety should be complete now. Also, was able to remove from Utility.Process the old API that I now know was not a good idea. And proof it was bad: The code size went *down*, despite there being a fair bit of boilerplate for some future API to reduce.
This commit is contained in:
parent
12e7d52c8b
commit
2670890b17
16 changed files with 196 additions and 191 deletions
|
@ -43,9 +43,13 @@ run params repo = assertLocal repo $
|
|||
|
||||
{- Runs git and forces it to be quiet, throwing an error if it fails. -}
|
||||
runQuiet :: [CommandParam] -> Repo -> IO ()
|
||||
runQuiet params repo = withQuietOutput createProcessSuccess $
|
||||
(proc "git" $ toCommand $ gitCommandLine (params) repo)
|
||||
{ env = gitEnv repo }
|
||||
runQuiet params repo = withNullHandle $ \nullh ->
|
||||
let p = (proc "git" $ toCommand $ gitCommandLine (params) repo)
|
||||
{ env = gitEnv repo
|
||||
, std_out = UseHandle nullh
|
||||
, std_err = UseHandle nullh
|
||||
}
|
||||
in withCreateProcess p $ \_ _ _ -> forceSuccessProcess p
|
||||
|
||||
{- Runs a git command and returns its output, lazily.
|
||||
-
|
||||
|
@ -99,9 +103,16 @@ pipeWriteRead params writer repo = assertLocal repo $
|
|||
|
||||
{- Runs a git command, feeding it input on a handle with an action. -}
|
||||
pipeWrite :: [CommandParam] -> Repo -> (Handle -> IO ()) -> IO ()
|
||||
pipeWrite params repo = assertLocal repo $
|
||||
withHandle StdinHandle createProcessSuccess $
|
||||
gitCreateProcess params repo
|
||||
pipeWrite params repo a = assertLocal repo $
|
||||
let p = (gitCreateProcess params repo)
|
||||
{ std_in = CreatePipe }
|
||||
in withCreateProcess p (go p)
|
||||
where
|
||||
go p (Just hin) _ _ pid =
|
||||
forceSuccessProcess p pid
|
||||
`after`
|
||||
a hin
|
||||
go _ _ _ _ _ = error "internal"
|
||||
|
||||
{- Reads null terminated output of a git command (as enabled by the -z
|
||||
- parameter), and splits it. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue