Merge pull request #19 from msakai/fix-deadlock

Fix deadlock in Numeric.Optimization.MIP.Internal.ProcessUtil
msakai · Feb 27, 2021 · 9a46bcb · 9a46bcb
2 parents cf6f494 + 7d7eb35
commit 9a46bcb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/MIP/src/Numeric/Optimization/MIP/Internal/ProcessUtil.hs b/MIP/src/Numeric/Optimization/MIP/Internal/ProcessUtil.hs
@@ -45,6 +45,9 @@ runProcessWithOutputCallback cmd args input putMsg putErr = do
     , std_out = CreatePipe
     , std_err = CreatePipe
     }
+  hSetBuffering outh LineBuffering
+  hSetBuffering errh LineBuffering
+
   req <- newEmptyTMVarIO
   let f act = atomically (putTMVar req act)
       m1 = forever (hGetLine outh >>= \s -> f (putMsg s))
@@ -59,8 +62,6 @@ runProcessWithOutputCallback cmd args input putMsg putErr = do
       -- hClose performs implicit hFlush, and thus may trigger a SIGPIPE
       ignoreSigPipe $ hClose inh
 
-      hSetBuffering outh LineBuffering
-      hSetBuffering errh LineBuffering
       let loop = join $ atomically $ msum $
             [ do act <- takeTMVar req
                  return $ act >> loop