Merge pull request #558 from kazu-yamamoto/strict2

Strict and StrictData

Author: kazu-yamamoto

Network/Socket/ByteString/IO.hsc

@@ -1,4 +1,3 @@
-{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 
@@ -294,9 +293,9 @@ withWSABuffromBS cs f = withBufSizs cs $ \bufsizs -> withWSABuf bufsizs f
 withBufSizs :: [ByteString] -> ([(Ptr Word8, Int)] -> IO a) -> IO a
 withBufSizs bss0 f = loop bss0 id
   where
-    loop []                    !build = f $ build []
-    loop (PS fptr off len:bss) !build = withForeignPtr fptr $ \ptr -> do
-        let !ptr' = ptr `plusPtr` off
+    loop []                    build = f $ build []
+    loop (PS fptr off len:bss) build = withForeignPtr fptr $ \ptr -> do
+        let ptr' = ptr `plusPtr` off
         loop bss (build . ((ptr',len) :))
 
 -- | Send data to the socket using sendmsg(2).

Network/Socket/ByteString/Lazy/Posix.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Network.Socket.ByteString.Lazy.Posix (
@@ -34,7 +33,7 @@ send s lbs = do
   where
     withPokes ss p f = loop ss p 0 0
       where
-        loop (c:cs) q k !niovs
+        loop (c:cs) q k niovs
             | k < maxNumBytes = unsafeUseAsCStringLen c $ \(ptr, len) -> do
                 poke q $ IOVec (castPtr ptr) (fromIntegral len)
                 loop cs

Network/Socket/Info.hsc

@@ -108,8 +108,8 @@ data AddrInfo = AddrInfo {
   } deriving (Eq, Show)
 
 instance Storable AddrInfo where
-    sizeOf    _ = #const sizeof(struct addrinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = #const sizeof(struct addrinfo)
+    alignment ~_ = alignment (0 :: CInt)
 
     peek p = do
         ai_flags <- (#peek struct addrinfo, ai_flags) p

Network/Socket/Options.hsc

@@ -50,11 +50,11 @@ import Network.Socket.ReadShow
 -- is supported on your system: see 'isSupportedSocketOption'
 data SocketOption = SockOpt
 #if __GLASGOW_HASKELL__ >= 806
-    !CInt -- ^ Option Level
-    !CInt -- ^ Option Name
+    CInt -- ^ Option Level
+    CInt -- ^ Option Name
 #else
-    !CInt -- Option Level
-    !CInt -- Option Name
+    CInt -- Option Level
+    CInt -- Option Name
 #endif
   deriving (Eq)
 
@@ -466,8 +466,8 @@ data StructLinger = StructLinger {
   deriving (Eq, Ord, Show)
 
 instance Storable StructLinger where
-    sizeOf    _ = (#const sizeof(struct linger))
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#const sizeof(struct linger))
+    alignment ~_ = alignment (0 :: CInt)
 
     peek p = do
         onoff  <- (#peek struct linger, l_onoff) p

Network/Socket/Posix/Cmsg.hsc

@@ -26,16 +26,16 @@ import qualified Text.Read as P
 
 -- | Control message (ancillary data) including a pair of level and type.
 data Cmsg = Cmsg {
-    cmsgId   :: !CmsgId
-  , cmsgData :: !ByteString
+    cmsgId   :: CmsgId
+  , cmsgData :: ByteString
   } deriving (Eq, Show)
 
 ----------------------------------------------------------------
 
 -- | Identifier of control message (ancillary data).
 data CmsgId = CmsgId {
-    cmsgLevel :: !CInt
-  , cmsgType  :: !CInt
+    cmsgLevel :: CInt
+  , cmsgType  :: CInt
   } deriving (Eq)
 
 -- | Unsupported identifier
@@ -177,8 +177,8 @@ instance ControlMessage IPv4PktInfo where
 
 instance Storable IPv4PktInfo where
 #if defined (IP_PKTINFO)
-    sizeOf    _ = (#size struct in_pktinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#size struct in_pktinfo)
+    alignment ~_ = alignment (0 :: CInt)
     poke p (IPv4PktInfo n sa ha) = do
         (#poke struct in_pktinfo, ipi_ifindex)  p (fromIntegral n :: CInt)
         (#poke struct in_pktinfo, ipi_spec_dst) p sa
@@ -189,8 +189,8 @@ instance Storable IPv4PktInfo where
         ha <- (#peek struct in_pktinfo, ipi_addr)     p
         return $ IPv4PktInfo n sa ha
 #else
-    sizeOf    _ = 0
-    alignment _ = 1
+    sizeOf    ~_ = 0
+    alignment ~_ = 1
     poke _ _ = error "Unsupported control message type"
     peek _   = error "Unsupported control message type"
 #endif
@@ -208,8 +208,8 @@ instance ControlMessage IPv6PktInfo where
 
 instance Storable IPv6PktInfo where
 #if defined (IPV6_PKTINFO)
-    sizeOf    _ = (#size struct in6_pktinfo)
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#size struct in6_pktinfo)
+    alignment ~_ = alignment (0 :: CInt)
     poke p (IPv6PktInfo n ha6) = do
         (#poke struct in6_pktinfo, ipi6_ifindex) p (fromIntegral n :: CInt)
         (#poke struct in6_pktinfo, ipi6_addr)    p (In6Addr ha6)
@@ -218,8 +218,8 @@ instance Storable IPv6PktInfo where
         n :: CInt   <- (#peek struct in6_pktinfo, ipi6_ifindex) p
         return $ IPv6PktInfo (fromIntegral n) ha6
 #else
-    sizeOf    _ = 0
-    alignment _ = 1
+    sizeOf    ~_ = 0
+    alignment ~_ = 1
     poke _ _ = error "Unsupported control message type"
     peek _   = error "Unsupported control message type"
 #endif

Network/Socket/Posix/CmsgHdr.hsc

@@ -23,17 +23,17 @@ import Network.Socket.Types
 
 data CmsgHdr = CmsgHdr {
 #ifdef __linux__
-    cmsgHdrLen   :: !CSize
+    cmsgHdrLen   :: CSize
 #else
-    cmsgHdrLen   :: !(#type socklen_t)
+    cmsgHdrLen   :: #type socklen_t
 #endif
-  , cmsgHdrLevel :: !CInt
-  , cmsgHdrType  :: !CInt
+  , cmsgHdrLevel :: CInt
+  , cmsgHdrType  :: CInt
   } deriving (Eq, Show)
 
 instance Storable CmsgHdr where
-  sizeOf    _ = (#size struct cmsghdr)
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#size struct cmsghdr)
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     len <- (#peek struct cmsghdr, cmsg_len)   p

Network/Socket/Posix/IOVec.hsc

@@ -14,13 +14,13 @@ import Network.Socket.Imports
 #include <sys/uio.h>
 
 data IOVec = IOVec
-    { iovBase :: !(Ptr Word8)
-    , iovLen  :: !CSize
+    { iovBase :: Ptr Word8
+    , iovLen  :: CSize
     }
 
 instance Storable IOVec where
-  sizeOf    _ = (#const sizeof(struct iovec))
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#const sizeof(struct iovec))
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     base <- (#peek struct iovec, iov_base) p

Network/Socket/Posix/MsgHdr.hsc

@@ -14,26 +14,26 @@ import Network.Socket.Internal (zeroMemory)
 import Network.Socket.Posix.IOVec (IOVec)
 
 data MsgHdr sa = MsgHdr
-    { msgName    :: !(Ptr sa)
-    , msgNameLen :: !(#type socklen_t)
-    , msgIov     :: !(Ptr IOVec)
+    { msgName    :: Ptr sa
+    , msgNameLen :: #type socklen_t
+    , msgIov     :: Ptr IOVec
 #ifdef __linux__
-    , msgIovLen  :: !CSize
+    , msgIovLen  :: CSize
 #else
-    , msgIovLen  :: !CInt
+    , msgIovLen  :: CInt
 #endif
-    , msgCtrl    :: !(Ptr Word8)
+    , msgCtrl    :: Ptr Word8
 #ifdef __linux__
-    , msgCtrlLen :: !CSize
+    , msgCtrlLen :: CSize
 #else
-    , msgCtrlLen :: !(#type socklen_t)
+    , msgCtrlLen :: #type socklen_t
 #endif
-    , msgFlags   :: !CInt
+    , msgFlags   :: CInt
     }
 
 instance Storable (MsgHdr sa) where
-  sizeOf    _ = (#const sizeof(struct msghdr))
-  alignment _ = alignment (0 :: CInt)
+  sizeOf    ~_ = (#const sizeof(struct msghdr))
+  alignment ~_ = alignment (0 :: CInt)
 
   peek p = do
     name       <- (#peek struct msghdr, msg_name)       p

Network/Socket/Types.hsc

@@ -104,7 +104,7 @@ import Network.Socket.ReadShow
 -----------------------------------------------------------------------------
 
 -- | Basic type for a socket.
-data Socket = Socket !(IORef CInt) !CInt {- for Show -}
+data Socket = Socket (IORef CInt) CInt {- for Show -}
 
 instance Show Socket where
     show (Socket _ ofd) = "<socket: " ++ show ofd ++ ">"
@@ -982,8 +982,8 @@ foreign import CALLCONV unsafe "ntohl" ntohl :: Word32 -> Word32
 {-# DEPRECATED ntohl "Use getAddrInfo instead" #-}
 
 instance Storable PortNumber where
-   sizeOf    _ = sizeOf    (0 :: Word16)
-   alignment _ = alignment (0 :: Word16)
+   sizeOf    ~_ = sizeOf    (0 :: Word16)
+   alignment ~_ = alignment (0 :: Word16)
    poke p (PortNum po) = poke (castPtr p) (htons po)
    peek p = PortNum . ntohs <$> peek (castPtr p)
 
@@ -1007,6 +1007,7 @@ class SocketAddress sa where
 sockaddrStorageLen :: Int
 sockaddrStorageLen = 128
 
+{-# NOINLINE withSocketAddress #-}
 withSocketAddress :: SocketAddress sa => sa -> (Ptr sa -> Int -> IO a) -> IO a
 withSocketAddress addr f = do
     let sz = sizeOfSocketAddress addr
@@ -1051,13 +1052,13 @@ type ScopeID = Word32
 -- 'isSupportedSockAddr'.
 data SockAddr
   = SockAddrInet
-        !PortNumber      -- sin_port
-        !HostAddress     -- sin_addr  (ditto)
+        PortNumber      -- sin_port
+        HostAddress     -- sin_addr  (ditto)
   | SockAddrInet6
-        !PortNumber      -- sin6_port
-        !FlowInfo        -- sin6_flowinfo (ditto)
-        !HostAddress6    -- sin6_addr (ditto)
-        !ScopeID         -- sin6_scope_id (ditto)
+        PortNumber      -- sin6_port
+        FlowInfo        -- sin6_flowinfo (ditto)
+        HostAddress6    -- sin6_addr (ditto)
+        ScopeID         -- sin6_scope_id (ditto)
   -- | The path must have fewer than 104 characters. All of these characters must have code points less than 256.
   | SockAddrUnix
         String           -- sun_path
@@ -1114,6 +1115,9 @@ sizeOfSockAddr SockAddrUnix{}  = #const sizeof(struct sockaddr_un)
 sizeOfSockAddr SockAddrInet{}  = #const sizeof(struct sockaddr_in)
 sizeOfSockAddr SockAddrInet6{} = #const sizeof(struct sockaddr_in6)
 
+-- The combination of "-XString" and inlining results in a bug where
+-- "sz" is always 0.
+{-# NOINLINE withSockAddr #-}
 -- | Use a 'SockAddr' with a function requiring a pointer to a
 -- 'SockAddr' and the length of that 'SockAddr'.
 withSockAddr :: SockAddr -> (Ptr SockAddr -> Int -> IO a) -> IO a
@@ -1279,8 +1283,8 @@ newtype In6Addr = In6Addr HostAddress6
 #endif
 
 instance Storable In6Addr where
-    sizeOf    _ = #const sizeof(struct in6_addr)
-    alignment _ = #alignment struct in6_addr
+    sizeOf    ~_ = #const sizeof(struct in6_addr)
+    alignment ~_ = #alignment struct in6_addr
 
     peek p = do
         a <- peek32 p 0

Network/Socket/Unix.hsc

@@ -88,8 +88,8 @@ getPeerCred s = do
 
 newtype PeerCred = PeerCred (CUInt, CUInt, CUInt)
 instance Storable PeerCred where
-    sizeOf    _ = (#const sizeof(struct ucred))
-    alignment _ = alignment (0 :: CInt)
+    sizeOf    ~_ = (#const sizeof(struct ucred))
+    alignment ~_ = alignment (0 :: CInt)
     poke _ _ = return ()
     peek p = do
         pid <- (#peek struct ucred, pid) p