Skip to content

Label some threads #31

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

Merged
jasagredo merged 1 commit into from
Feb 4, 2025
Merged

Label some threads #31

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
17 changes: 11 additions & 6 deletions src/System/Win32/Async/Socket.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Control.Concurrent
import Control.Exception
import Data.Word
import GHC.IO.Exception (IOErrorType(InvalidArgument))
import GHC.Conc (labelThread)
import System.IO.Error

import Foreign.Ptr (Ptr, castPtr)
Expand Down Expand Up @@ -78,15 +79,17 @@ sendBufTo sock buf size sa =
else return $ ErrorSync (WsaErrorCode errorCode) False


-- | Unfortunately `connect` using interruptible ffi is not interruptible.
-- | Unfortunately `connect` using interruptible ffi is not interruptible.
-- Instead we run the `Socket.connect` in a dedicated thread and block on an
-- 'MVar'.
-- 'MVar'.
--
connect :: Socket -> SockAddr -> IO ()
connect sock addr = do
v <- newEmptyMVar
_ <- mask_ $ forkIOWithUnmask $ \unmask ->
(unmask (Socket.connect sock addr) >> putMVar v Nothing)
_ <- mask_ $ forkIOWithUnmask $ \unmask ->
(do
myThreadId >>= flip labelThread "win32-network.connect"
unmask (Socket.connect sock addr) >> putMVar v Nothing)
`catch` (\(e :: IOException) -> putMVar v (Just e))
r <- takeMVar v
case r of
Expand All @@ -107,8 +110,10 @@ connect sock addr = do
accept :: Socket -> IO (Socket, SockAddr)
accept sock = do
v <- newEmptyMVar
_ <- mask_ $ forkIOWithUnmask $ \unmask ->
(unmask (Socket.accept sock) >>= putMVar v . Right)
_ <- mask_ $ forkIOWithUnmask $ \unmask ->
(do
myThreadId >>= flip labelThread "win32-network.accept"
unmask (Socket.accept sock) >>= putMVar v . Right)
`catch` (\(e :: IOException) -> putMVar v (Left e))
r <- takeMVar v
case r of
Expand Down