Skip to content

Replace forkIO with async for server listener #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

Replace forkIO with async for server listener #628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lsp-test/src/Language/LSP/Test/Session.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ import Data.IORef
import Colog.Core (LogAction (..), WithSeverity (..), Severity (..))
import Data.String (fromString)
import Data.Either (partitionEithers)
import Control.Concurrent.Async (async, cancel)

-- | A session representing one instance of launching and connecting to a server.
--
Expand Down Expand Up @@ -303,9 +304,9 @@ runSession' serverIn serverOut mServerProc serverHandler config caps rootDir exi

errorHandler = throwTo mainThreadId :: SessionException -> IO ()
serverListenerLauncher =
forkIO $ catch (serverHandler serverOut context) errorHandler
async $ catch (serverHandler serverOut context) errorHandler
msgTimeoutMs = messageTimeout config * 10^6
serverAndListenerFinalizer tid = do
serverAndListenerFinalizer async = do
let cleanup
| Just sp <- mServerProc = do
-- Give the server some time to exit cleanly
Expand All @@ -318,7 +319,7 @@ runSession' serverIn serverOut mServerProc serverHandler config caps rootDir exi
finally (timeout msgTimeoutMs (runSession' exitServer))
-- Make sure to kill the listener first, before closing
-- handles etc via cleanupProcess
(killThread tid >> cleanup)
(cancel async >> cleanup)

(result, _) <- bracket serverListenerLauncher
serverAndListenerFinalizer
Expand Down
Loading