7ac9ab7 · streamly · git.iko.soy

.github/workflows/regression-check.yml+1−1

compare with master

unifiedsplit

@@ -28,7 +28,7 @@ jobs:

28 Data.Stream.StreamK:6

29 Data.Unfold

30 Data.Stream

31− Data.Stream.Async

31+ Data.Stream.Concurrent

32 FileSystem.Handle

33 Prelude.Ahead

34 Prelude.Async:12

benchmark/Streamly/Benchmark/Data/Stream/Async.hs+1−1

@@ -10,7 +10,7 @@ import Stream.AsyncCommon (allBenchmarks, interleaveBenchmarks)

10import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)

11

12moduleName :: String

13−moduleName = "Data.Stream.Async"

13+moduleName = "Data.Stream.Concurrent"

14

15-------------------------------------------------------------------------------

16-- Main

benchmark/Streamly/Benchmark/Data/Stream/AsyncCommon.hs+2−2

@@ -15,12 +15,12 @@ where

15import Stream.Common

16 (composeN, benchIO, benchIOSink, benchIOSrc, sourceUnfoldrM)

17import Streamly.Data.Stream (Stream)

18−import Streamly.Internal.Data.Stream.Async (MonadAsync, Config)

18+import Streamly.Internal.Data.Stream.Concurrent (MonadAsync, Config)

19

20import qualified Data.List as List

21import qualified Streamly.Data.Fold as Fold

22import qualified Streamly.Data.Stream as Stream

23−import qualified Streamly.Internal.Data.Stream.Async as Async

23+import qualified Streamly.Internal.Data.Stream.Concurrent as Async

24

25import Gauge

26import Prelude hiding (mapM)

benchmark/Streamly/Benchmark/Data/Stream/AsyncEager.hs+1−1

@@ -9,7 +9,7 @@

9import Stream.AsyncCommon (allBenchmarks)

10import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)

11

12−import qualified Streamly.Internal.Data.Stream.Async as Async

12+import qualified Streamly.Internal.Data.Stream.Concurrent as Async

13

14moduleName :: String

15moduleName = "Data.Stream.AsyncEager"

benchmark/Streamly/Benchmark/Data/Stream/AsyncOrdered.hs+1−1

@@ -9,7 +9,7 @@

9import Stream.AsyncCommon (allBenchmarks)

10import Streamly.Benchmark.Common (runWithCLIOpts, defaultStreamSize)

11

12−import qualified Streamly.Internal.Data.Stream.Async as Async

12+import qualified Streamly.Internal.Data.Stream.Concurrent as Async

13

14moduleName :: String

15moduleName = "Data.Stream.AsyncOrdered"

hie.yaml+5−5

@@ -41,9 +41,9 @@ cradle:

41 - path: "./benchmark/Streamly/Benchmark/Data/Stream/Transform.hs"

42 component: "bench:Data.Stream"

43 - path: "./benchmark/Streamly/Benchmark/Data/Stream/Async.hs"

44− component: "bench:Data.Stream.Async"

44+ component: "bench:Data.Stream.Concurrent"

45 - path: "./benchmark/Streamly/Benchmark/Data/Stream/AsyncCommon.hs"

46− component: "bench:Data.Stream.Async"

46+ component: "bench:Data.Stream.Concurrent"

47 - path: "./benchmark/Streamly/Benchmark/Data/Stream/AsyncEager.hs"

48 component: "bench:Data.Stream.AsyncEager"

49 - path: "./benchmark/Streamly/Benchmark/Data/Unfold.hs"

@@ -90,10 +90,10 @@ cradle:

90 component: "test:Data.List"

91 - path: "./test/Streamly/Test/Data/Parser.hs"

92 component: "test:Data.Parser"

93− - path: "./test/Streamly/Test/Data/Stream/Async.hs"

93+ - path: "./test/Streamly/Test/Data/Stream/Concurrent.hs"

94− component: "test:Data.Stream.Async"

94+ component: "test:Data.Stream.Concurrent"

95 - path: "./test/Streamly/Test/Data/Stream/Common.hs"

96− component: "test:Data.Stream.Async"

96+ component: "test:Data.Stream.Concurrent"

97 - path: "./test/Streamly/Test/Data/Parser/ParserD.hs"

98 component: "test:Data.Parser.ParserD"

99 - path: "./test/Streamly/Test/Data/Unfold.hs"

src/Streamly/Internal/Data/Stream/Channel/Worker.hs+1−1

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Worker

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Worker

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

src/Streamly/Internal/Data/Stream/Async.hs → src/Streamly/Internal/Data/Stream/Concurrent.hsrenamed+4−4

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async

2+-- Module : Streamly.Internal.Data.Stream.Concurrent

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

@@ -16,7 +16,7 @@

16-- Common Channel functionality to Data.Channel.

17-- Stream channel to Data.Stream.Channel.

18

19−module Streamly.Internal.Data.Stream.Async

19+module Streamly.Internal.Data.Stream.Concurrent

20 (

21 -- * Imports

22 -- $setup

@@ -79,7 +79,7 @@ import Streamly.Internal.Data.Stream.Type (Stream)

79

80import qualified Streamly.Internal.Data.Stream as Stream

81

82−import Streamly.Internal.Data.Stream.Async.Channel

82+import Streamly.Internal.Data.Stream.Concurrent.Channel

83import Prelude hiding (mapM, sequence, concat, concatMap)

84

85-- $setup

@@ -92,7 +92,7 @@ import Prelude hiding (mapM, sequence, concat, concatMap)

92-- >>> import qualified Streamly.Data.Fold as Fold

93-- >>> import qualified Streamly.Data.Parser as Parser

94-- >>> import qualified Streamly.Data.Stream as Stream

95−-- >>> import qualified Streamly.Internal.Data.Stream.Async as Async

95+-- >>> import qualified Streamly.Internal.Data.Stream.Concurrent as Async

96-- >>> import Prelude hiding (concatMap, concat)

97-- >>> :{

98-- delay n = do

src/Streamly/Internal/Data/Stream/Async/Channel.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel.hsrenamed+6−6

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8

9−module Streamly.Internal.Data.Stream.Async.Channel

9+module Streamly.Internal.Data.Stream.Concurrent.Channel

10 (

11 -- * Channel

12 Channel

@@ -47,16 +47,16 @@ where

47

48import Control.Monad.IO.Class (MonadIO(liftIO))

49import Streamly.Internal.Control.Concurrent (MonadAsync, askRunInIO)

50−import Streamly.Internal.Data.Stream.Async.Channel.Operations

50+import Streamly.Internal.Data.Stream.Concurrent.Channel.Operations

51 (fromChannel, fromChannelK, toChannel, toChannelK)

52

53import qualified Streamly.Internal.Data.Stream as Stream

54−import qualified Streamly.Internal.Data.Stream.Async.Channel.Append as Append

54+import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Append as Append

55−import qualified Streamly.Internal.Data.Stream.Async.Channel.Interleave

55+import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave

56 as Interleave

57import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

58

59−import Streamly.Internal.Data.Stream.Async.Channel.Type

59+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

60import Streamly.Internal.Data.Stream.Channel.Types

61

62-- | Allocate a channel and evaluate the stream using the channel and the

src/Streamly/Internal/Data/Stream/Async/Channel/Append.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Append.hsrenamed+5−5

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Append

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Append

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

@@ -13,7 +13,7 @@

13-- use INLINABLE and SPECIALIZE on it which makes it specialized but it is not

14-- actually inlined.

15

16−module Streamly.Internal.Data.Stream.Async.Channel.Append

16+module Streamly.Internal.Data.Stream.Concurrent.Channel.Append

17 (

18 newChannel

19 )

@@ -39,9 +39,9 @@ import qualified Data.Heap as H

39import qualified Data.Set as Set

40import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

41

42−import Streamly.Internal.Data.Stream.Async.Channel.Consumer

42+import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

43−import Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

43+import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

44−import Streamly.Internal.Data.Stream.Async.Channel.Type

44+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

45import Streamly.Internal.Data.Stream.Channel.Types

46import Streamly.Internal.Data.Stream.Channel.Worker

47

src/Streamly/Internal/Data/Stream/Async/Channel/Consumer.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Consumer.hsrenamed+4−4

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Consumer

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8--

9−module Streamly.Internal.Data.Stream.Async.Channel.Consumer

9+module Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

10 (

11 -- * Read Output

12 readOutputQPaced

@@ -23,8 +23,8 @@ import Control.Monad (when, void)

23import Control.Monad.IO.Class (MonadIO(liftIO))

24import Data.IORef (readIORef)

25

26−import Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

26+import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

27−import Streamly.Internal.Data.Stream.Async.Channel.Type

27+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

28import Streamly.Internal.Data.Stream.Channel.Dispatcher

29import Streamly.Internal.Data.Stream.Channel.Types

30

src/Streamly/Internal/Data/Stream/Async/Channel/Dispatcher.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Dispatcher.hsrenamed+3−3

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

@@ -7,7 +7,7 @@

7-- Portability : GHC

8--

9--

10−module Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

10+module Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

11 (

12 -- * Dispatching

13 pushWorker

@@ -33,7 +33,7 @@ import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

33import Streamly.Internal.Data.Time.Units

34 (MicroSecond64(..), diffAbsTime64, fromRelTime64, toRelTime64)

35

36−import Streamly.Internal.Data.Stream.Async.Channel.Type

36+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

37import Streamly.Internal.Data.Stream.Channel.Dispatcher

38import Streamly.Internal.Data.Stream.Channel.Types

39import Streamly.Internal.Data.Stream.Channel.Worker

src/Streamly/Internal/Data/Stream/Async/Channel/Interleave.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Interleave.hsrenamed+4−4

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Interleave

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8

9−module Streamly.Internal.Data.Stream.Async.Channel.Interleave

9+module Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave

10 (

11 newChannel

12 )

@@ -27,8 +27,8 @@ import Streamly.Internal.Data.Stream.Channel.Dispatcher (delThread)

27import qualified Data.Set as Set

28import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

29

30−import Streamly.Internal.Data.Stream.Async.Channel.Consumer

30+import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

31−import Streamly.Internal.Data.Stream.Async.Channel.Type

31+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

32import Streamly.Internal.Data.Stream.Channel.Types

33

34------------------------------------------------------------------------------

src/Streamly/Internal/Data/Stream/Async/Channel/Operations.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hsrenamed+4−4

@@ -8,14 +8,14 @@

8#endif

9

10-- |

11−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Operations

11+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Operations

13-- License : BSD-3-Clause

14-- Maintainer : streamly@composewell.com

15-- Stability : experimental

16-- Portability : GHC

17

18−module Streamly.Internal.Data.Stream.Async.Channel.Operations

18+module Streamly.Internal.Data.Stream.Concurrent.Channel.Operations

19 (

20 toChannel

21 , toChannelK

@@ -42,8 +42,8 @@ import qualified Streamly.Internal.Data.Stream as Stream

42import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

43import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

44

45−import Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

45+import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

46−import Streamly.Internal.Data.Stream.Async.Channel.Type

46+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

47import Streamly.Internal.Data.Stream.Channel.Types

48

49import Prelude hiding (map, concat, concatMap)

src/Streamly/Internal/Data/Stream/Async/Channel/Type.hs → src/Streamly/Internal/Data/Stream/Concurrent/Channel/Type.hsrenamed+2−2

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Internal.Data.Stream.Async.Channel.Type

2+-- Module : Streamly.Internal.Data.Stream.Concurrent.Channel.Type

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8

9−module Streamly.Internal.Data.Stream.Async.Channel.Type

9+module Streamly.Internal.Data.Stream.Concurrent.Channel.Type

10 (

11 Channel(..)

12 , yield

streamly.cabal+9−9

@@ -96,7 +96,7 @@ extra-source-files:

96 test/Streamly/Test/Data/Ring/Unboxed.hs

97 test/Streamly/Test/Data/Array/Stream/Unboxed.hs

98 test/Streamly/Test/Data/Parser/ParserD.hs

99− test/Streamly/Test/Data/Stream/Async.hs

99+ test/Streamly/Test/Data/Stream/Concurrent.hs

100 test/Streamly/Test/FileSystem/Event.hs

101 test/Streamly/Test/FileSystem/Event/Common.hs

102 test/Streamly/Test/FileSystem/Event/Darwin.hs

@@ -464,14 +464,14 @@ library

464 , Streamly.Internal.Data.Stream.Channel.Dispatcher

465 , Streamly.Internal.Data.Stream.Channel.Worker

466

467− , Streamly.Internal.Data.Stream.Async.Channel.Type

467+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Type

468− , Streamly.Internal.Data.Stream.Async.Channel.Dispatcher

468+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher

469− , Streamly.Internal.Data.Stream.Async.Channel.Consumer

469+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer

470− , Streamly.Internal.Data.Stream.Async.Channel.Append

470+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Append

471− , Streamly.Internal.Data.Stream.Async.Channel.Interleave

471+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave

472− , Streamly.Internal.Data.Stream.Async.Channel.Operations

472+ , Streamly.Internal.Data.Stream.Concurrent.Channel.Operations

473− , Streamly.Internal.Data.Stream.Async.Channel

473+ , Streamly.Internal.Data.Stream.Concurrent.Channel

474− , Streamly.Internal.Data.Stream.Async

474+ , Streamly.Internal.Data.Stream.Concurrent

475 , Streamly.Internal.Data.Stream.Ahead

476 , Streamly.Internal.Data.Stream.ZipAsync

477

targets/Targets.hs+1−1

@@ -27,7 +27,7 @@ targets =

27 , "serial_async_cmp"

28 ]

29 )

30− , ("Data.Stream.Async",

30+ , ("Data.Stream.Concurrent",

31 [ "prelude_concurrent_grp"

32 , "infinite_grp"

33 , "concurrent_cmp"

test/Streamly/Test/Data/Stream/Async.hs → test/Streamly/Test/Data/Stream/Concurrent.hsrenamed+4−4

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Test.Data.Stream.Async

2+-- Module : Streamly.Test.Data.Stream.Concurrent

4--

5-- License : BSD-3-Clause

@@ -7,7 +7,7 @@

7-- Stability : experimental

8-- Portability : GHC

9

10−module Streamly.Test.Data.Stream.Async (main) where

10+module Streamly.Test.Data.Stream.Concurrent (main) where

11

12#ifdef DEVBUILD

13import Control.Concurrent (threadDelay)

@@ -25,12 +25,12 @@ import Test.Hspec as H

25

26import qualified Streamly.Data.Fold as Fold

27import qualified Streamly.Data.Stream as Stream

28−import qualified Streamly.Internal.Data.Stream.Async as Async

28+import qualified Streamly.Internal.Data.Stream.Concurrent as Async

29

30import Streamly.Test.Common (listEquals)

31

32moduleName :: String

33−moduleName = "Data.Stream.Async"

33+moduleName = "Data.Stream.Concurrent"

34

35-------------------------------------------------------------------------------

36-- Utilities

test/streamly-tests.cabal+3−3

@@ -389,11 +389,11 @@ test-suite Prelude.Async

389 if flag(use-streamly-core)

390 buildable: False

391

392−test-suite Data.Stream.Async

392+test-suite Data.Stream.Concurrent

393 import: test-options

394 type: exitcode-stdio-1.0

395− main-is: Streamly/Test/Data/Stream/Async.hs

395+ main-is: Streamly/Test/Data/Stream/Concurrent.hs

396− ghc-options: -main-is Streamly.Test.Data.Stream.Async.main

396+ ghc-options: -main-is Streamly.Test.Data.Stream.Concurrent.main

397 if flag(use-streamly-core)

398 buildable: False

399