git.iko.soy/streamly
on master help sign in
Move rate/conc control to IsStream/Transform
commit7b2b46366557981cdaaed1aad827880247cf5c69 authorHarendra Kumar <harendra@composewell.com> dateSat 16 Jan 2021, 20:09 (6 years ago) parent0fd1eb1
6 files changed+28−16
compare with master
unifiedsplit
src/Streamly.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream.hs−5 src/Streamly/Internal/Data/Stream/Combinators.hs → src/Streamly/Internal/Data/Stream/IsStream/Combinators.hs+4−5 src/Streamly/Internal/Data/Stream/IsStream/Common.hs+1−1 src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+21−3 streamly.cabal+1−1
src/Streamly.hs+1−1
@@ -213,7 +213,7 @@ import Data.Semigroup (Semigroup(..))
213213import Streamly.Internal.Data.SVar (MonadAsync, Rate(..))
214214import Streamly.Internal.Data.Stream.Ahead
215215import Streamly.Internal.Data.Stream.Async hiding (mkAsync)
216−import Streamly.Internal.Data.Stream.Combinators
216+import Streamly.Internal.Data.Stream.IsStream.Combinators
217217import Streamly.Internal.Data.Stream.Parallel
218218import Streamly.Internal.Data.Stream.Serial
219219import Streamly.Internal.Data.Stream.StreamK hiding (serial)
src/Streamly/Internal/Data/Stream/IsStream.hs−5
@@ -591,11 +591,6 @@ module Streamly.Internal.Data.Stream.IsStream
591591 )
592592where
593593
594−import Streamly.Internal.Data.SVar (Rate (..))
595−import Streamly.Internal.Data.Stream.Combinators
596− ( inspectMode, maxBuffer, maxThreads, rate, avgRate, minRate
597− , maxRate, constRate)
598−
599594import qualified Streamly.Internal.Data.Stream.Parallel as Par
600595import qualified Streamly.Internal.Data.Stream.Prelude as P
601596import qualified Streamly.Internal.Data.Stream.StreamD as D
src/Streamly/Internal/Data/Stream/Combinators.hs → src/Streamly/Internal/Data/Stream/IsStream/Combinators.hsrenamed+4−5
@@ -1,16 +1,13 @@
1−#include "inline.hs"
2−
31-- |
42-- Module : Streamly.Internal.Data.Stream.Combinators
53-- Copyright : (c) 2017 Composewell Technologies
6−--
7−-- License : BSD3
4+-- License : BSD-3-Clause
85-- Maintainer : streamly@composewell.com
96-- Stability : experimental
107-- Portability : GHC
118--
129--
13−module Streamly.Internal.Data.Stream.Combinators
10+module Streamly.Internal.Data.Stream.IsStream.Combinators
1411 ( maxThreads
1512 , maxBuffer
1613 , maxYields
@@ -24,6 +21,8 @@ module Streamly.Internal.Data.Stream.Combinators
2421 )
2522where
2623
24+#include "inline.hs"
25+
2726import Control.Monad.IO.Class (MonadIO(liftIO))
2827import Data.Int (Int64)
2928
src/Streamly/Internal/Data/Stream/IsStream/Common.hs+1−1
@@ -50,7 +50,7 @@ import Control.Monad.IO.Class (MonadIO(..))
5050import Foreign.Storable (Storable)
5151import Streamly.Internal.Data.Array.Storable.Foreign.Types (Array)
5252import Streamly.Internal.Data.Fold.Types (Fold (..))
53−import Streamly.Internal.Data.Stream.Combinators (maxYields)
53+import Streamly.Internal.Data.Stream.IsStream.Combinators (maxYields)
5454import Streamly.Internal.Data.Stream.Prelude (fromStreamS, toStreamS)
5555import Streamly.Internal.Data.Stream.Serial (SerialT)
5656import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)
src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+21−3
@@ -158,6 +158,21 @@ module Streamly.Internal.Data.Stream.IsStream.Transform
158158 , (|$)
159159 , (|&)
160160
161+ -- ** Concurrency Control
162+ , maxThreads
163+ , maxBuffer
164+
165+ -- ** Rate Limiting
166+ , Rate (..)
167+ , rate
168+ , avgRate
169+ , minRate
170+ , maxRate
171+ , constRate
172+
173+ -- * Diagnostics
174+ , inspectMode
175+
161176 -- * Deprecated
162177 , scanx
163178 )
@@ -174,7 +189,10 @@ import Data.Either (isLeft, isRight)
174189import Data.Maybe (isJust, fromJust)
175190import Streamly.Internal.BaseCompat (fromLeft, fromRight)
176191import Streamly.Internal.Data.Fold.Types (Fold (..))
177−import Streamly.Internal.Data.SVar (MonadAsync)
192+import Streamly.Internal.Data.Pipe.Types (Pipe (..))
193+import Streamly.Internal.Data.Stream.IsStream.Combinators
194+ ( inspectMode, maxBuffer, maxThreads, rate, avgRate, minRate
195+ , maxRate, constRate)
178196import Streamly.Internal.Data.Stream.IsStream.Common
179197 ( absTimesWith
180198 , drop
@@ -191,10 +209,10 @@ import Streamly.Internal.Data.Stream.IsStream.Common
191209 , intersperseM
192210 )
193211import Streamly.Internal.Data.Stream.Prelude (fromStreamS, toStreamS)
212+import Streamly.Internal.Data.Stream.Serial (SerialT)
194213import Streamly.Internal.Data.Stream.StreamD (fromStreamD, toStreamD)
195214import Streamly.Internal.Data.Stream.StreamK (IsStream)
196−import Streamly.Internal.Data.Stream.Serial (SerialT)
197−import Streamly.Internal.Data.Pipe.Types (Pipe (..))
215+import Streamly.Internal.Data.SVar (MonadAsync, Rate(..))
198216import Streamly.Internal.Data.Time.Units ( TimeUnit64, AbsTime, RelTime64)
199217
200218import qualified Streamly.Internal.Data.Fold as FL
streamly.cabal+1−1
@@ -470,13 +470,13 @@ library
470470 , Streamly.Internal.Data.Stream.Parallel
471471 , Streamly.Internal.Data.Stream.Ahead
472472 , Streamly.Internal.Data.Stream.Zip
473− , Streamly.Internal.Data.Stream.Combinators
474473 , Streamly.Internal.Data.Stream.IsStream.Common
475474 , Streamly.Internal.Data.Stream.IsStream.Types
476475 , Streamly.Internal.Data.Stream.IsStream.Enumeration
477476 , Streamly.Internal.Data.Stream.IsStream.Generate
478477 , Streamly.Internal.Data.Stream.IsStream.Eliminate
479478 , Streamly.Internal.Data.Stream.IsStream.Transform
479+ , Streamly.Internal.Data.Stream.IsStream.Combinators
480480 , Streamly.Internal.Data.Stream.IsStream.Nesting
481481 , Streamly.Internal.Data.Stream.IsStream.Exception
482482 , Streamly.Internal.Data.Stream.IsStream.Lift