git.iko.soy/streamly
on master help sign in
Add INLINEs and fix perf degradation due to exception handling
2eb8bb8Harendra Kumar
src/Streamly/Network/Client.hs+29−10
compare with master
unifiedsplit
@@ -66,10 +66,11 @@ import Prelude hiding (read)
66import qualified Network.Socket as Net
66import qualified Network.Socket as Net
67
67
68import Streamly (MonadAsync)
68import Streamly (MonadAsync)
69−import Streamly.Mem.Array.Types (Array(..))
69+import Streamly.Mem.Array.Types (Array(..), defaultChunkSize)
70import Streamly.Streams.Serial (SerialT)
70import Streamly.Streams.Serial (SerialT)
71import Streamly.Streams.StreamK.Type (IsStream)
71import Streamly.Streams.StreamK.Type (IsStream)
72
72
73+import qualified Streamly.Mem.Array as A
73import qualified Streamly.Prelude as S
74import qualified Streamly.Prelude as S
74import qualified Streamly.Network.Socket as SK
75import qualified Streamly.Network.Socket as SK
75
76
@@ -91,6 +92,7 @@ openConnection addr port = do
91-- 'withConnection' rather than any exception raised by 'act'.
92-- 'withConnection' rather than any exception raised by 'act'.
92--
93--
93-- @since 0.7.0
94-- @since 0.7.0
95+{-# INLINABLE withConnection #-}
94withConnection :: (IsStream t, MonadCatch m, MonadIO m)
96withConnection :: (IsStream t, MonadCatch m, MonadIO m)
95 => (Word8, Word8, Word8, Word8) -> PortNumber -> (Socket -> t m a) -> t m a
97 => (Word8, Word8, Word8, Word8) -> PortNumber -> (Socket -> t m a) -> t m a
96withConnection addr port =
98withConnection addr port =
@@ -103,26 +105,20 @@ withConnection addr port =
103-- | Read a stream from the supplied IPv4 host address and port number.
105-- | Read a stream from the supplied IPv4 host address and port number.
104--
106--
105-- @since 0.7.0
107-- @since 0.7.0
108+{-# INLINE read #-}
106read :: (IsStream t, MonadCatch m, MonadIO m)
109read :: (IsStream t, MonadCatch m, MonadIO m)
107 => (Word8, Word8, Word8, Word8) -> PortNumber -> t m Word8
110 => (Word8, Word8, Word8, Word8) -> PortNumber -> t m Word8
108−read addr port = withConnection addr port SK.read
111+read addr port = A.flattenArrays $ withConnection addr port SK.readArrays
109
112
110-------------------------------------------------------------------------------
113-------------------------------------------------------------------------------
111-- Writing
114-- Writing
112-------------------------------------------------------------------------------
115-------------------------------------------------------------------------------
113
116
114−-- | Write a stream to the supplied IPv4 host address and port number.
115−--
116−-- @since 0.7.0
117−write :: (MonadCatch m, MonadIO m)
118− => (Word8, Word8, Word8, Word8) -> PortNumber -> SerialT m Word8 -> m ()
119−write addr port xs =
120− S.drain $ withConnection addr port (\sk -> S.yieldM $ SK.write sk xs)
121−
122-- | Write a stream of arrays to the supplied IPv4 host address and port
117-- | Write a stream of arrays to the supplied IPv4 host address and port
123-- number.
118-- number.
124--
119--
125-- @since 0.7.0
120-- @since 0.7.0
121+{-# INLINE writeArrays #-}
126writeArrays
122writeArrays
127 :: (MonadCatch m, MonadAsync m)
123 :: (MonadCatch m, MonadAsync m)
128 => (Word8, Word8, Word8, Word8)
124 => (Word8, Word8, Word8, Word8)
@@ -131,3 +127,26 @@ writeArrays
131 -> m ()
127 -> m ()
132writeArrays addr port xs =
128writeArrays addr port xs =
133 S.drain $ withConnection addr port (\sk -> S.yieldM $ SK.writeArrays sk xs)
129 S.drain $ withConnection addr port (\sk -> S.yieldM $ SK.writeArrays sk xs)
130+
131+-- | Like 'write' but provides control over the write buffer. Output will
132+-- be written to the IO device as soon as we collect the specified number of
133+-- input elements.
134+--
135+-- @since 0.7.0
136+{-# INLINE writeByChunks #-}
137+writeByChunks
138+ :: (MonadCatch m, MonadAsync m)
139+ => Int
140+ -> (Word8, Word8, Word8, Word8)
141+ -> PortNumber
142+ -> SerialT m Word8
143+ -> m ()
144+writeByChunks n addr port m = writeArrays addr port $ A.arraysOf n m
145+
146+-- | Write a stream to the supplied IPv4 host address and port number.
147+--
148+-- @since 0.7.0
149+{-# INLINE write #-}
150+write :: (MonadCatch m, MonadAsync m)
151+ => (Word8, Word8, Word8, Word8) -> PortNumber -> SerialT m Word8 -> m ()
152+write = writeByChunks defaultChunkSize
src/Streamly/Network/Socket.hs+3−1
@@ -247,8 +247,10 @@ read :: (IsStream t, MonadIO m) => Socket -> t m Word8
247read = A.flattenArrays . readArrays
247read = A.flattenArrays . readArrays
248
248
249-- | Read a stream of Word8 from a socket, closing the socket when done.
249-- | Read a stream of Word8 from a socket, closing the socket when done.
250+{-# INLINE fromSocket #-}
250fromSocket :: (MonadCatch m, MonadIO m) => Socket -> SerialT m Word8
251fromSocket :: (MonadCatch m, MonadIO m) => Socket -> SerialT m Word8
252+fromSocket sk = A.flattenArrays $
251−fromSocket sk = S.finally (liftIO (Net.close sk)) (read sk)
253+ S.finally (liftIO (Net.close sk)) (readArrays sk)
252
254
253-------------------------------------------------------------------------------
255-------------------------------------------------------------------------------
254-- Writing
256-- Writing