8b55b1a · streamly · git.iko.soy

benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+1−2

compare with master

unifiedsplit

@@ -12,8 +12,7 @@ module Main (main) where

12

13import Control.Monad (void)

14import GHC.Ptr (Ptr(..))

15−

16−import qualified Streamly.Internal.Data.Array.Type as Array

15+import qualified Streamly.Internal.Data.Array as Array

17import qualified Streamly.Internal.Data.Ring as Ring

16import qualified Streamly.Internal.Data.Ring as Ring

18import qualified Data.Foldable as P

17import qualified Data.Foldable as P

19

18

benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1

@@ -33,7 +33,7 @@ import qualified Streamly.Data.Stream as Stream

33import qualified Streamly.Data.Fold as Fold

34import qualified Streamly.FileSystem.Handle as FH

35import qualified Streamly.Internal.Data.Array as A

36−import qualified Streamly.Internal.Data.Array.Type as AT

36+import qualified Streamly.Internal.Data.Array as AT

37import qualified Streamly.Internal.Data.Fold as FL

38import qualified Streamly.Internal.Data.Stream as IP

39import qualified Streamly.Internal.FileSystem.Handle as IFH

benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+1−1

@@ -43,7 +43,7 @@ import Streamly.Internal.Data.Stream (Step(..))

43import qualified Streamly.Internal.Data.Stream as D

44import qualified Streamly.Internal.Data.Tuple.Strict as Strict

45import qualified Streamly.Internal.Data.Stream.MutChunked as MAS

46−import qualified Streamly.Internal.Data.Array.Type as AT

46+import qualified Streamly.Internal.Data.Array as AT

47

48import Test.Inspection

49#endif

benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1

@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Unbox (Unbox)

42import Streamly.Internal.Data.Stream.StreamD (Step(..))

43import qualified Streamly.Internal.Data.Fold as Fold

44import qualified Streamly.Internal.Data.Tuple.Strict as Strict

45−import qualified Streamly.Internal.Data.Array.Type as Array

45+import qualified Streamly.Internal.Data.Array as Array

46

47import Test.Inspection

48#endif

core/src/DocTestDataArray.hs+5

@@ -1,6 +1,7 @@

1{- $setup

2>>> :m

3>>> :set -XFlexibleContexts

4+>>> :set -XMagicHash

4>>> import Data.Function ((&))

5>>> import Data.Function ((&))

5>>> import Data.Functor.Identity (Identity(..))

6>>> import Data.Functor.Identity (Identity(..))

6>>> import System.IO.Unsafe (unsafePerformIO)

7>>> import System.IO.Unsafe (unsafePerformIO)

@@ -11,4 +12,8 @@

11>>> import qualified Streamly.Data.Array as Array

12>>> import qualified Streamly.Data.Array as Array

12>>> import qualified Streamly.Data.Fold as Fold

13>>> import qualified Streamly.Data.Fold as Fold

13>>> import qualified Streamly.Data.Stream as Stream

14>>> import qualified Streamly.Data.Stream as Stream

15+

16+For APIs that have not been released yet.

17+

18+>>> import qualified Streamly.Internal.Data.Array as Array

14-}

19-}

core/src/DocTestFileSystemHandle.hs+1−1

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

8

9For APIs that have not been released yet.

10

11−>>> import qualified Streamly.Internal.Data.Array.Type as Array (writeNUnsafe)

11+>>> import qualified Streamly.Internal.Data.Array as Array (writeNUnsafe)

12>>> import qualified Streamly.Internal.Data.Unfold as Unfold (first)

13>>> import qualified Streamly.Internal.FileSystem.Handle as Handle

14>>> import qualified Streamly.Internal.System.IO as IO (defaultChunkSize)

core/src/Streamly/Data/Array.hs+13−14

@@ -29,7 +29,7 @@ module Streamly.Data.Array

29 -- $overview

30

31 -- * The Array Type

32− A.Array

32+ Array

33

34 -- * Construction

35 -- | When performance matters, the fastest way to generate an array is

@@ -40,31 +40,31 @@ module Streamly.Data.Array

40 -- 'fromList' can be used to construct an array from a string literal.

41

42 -- Pure List APIs

43− , A.fromListN

43+ , fromListN

44− , A.fromList

44+ , fromList

45

46 -- Monadic APIs

47− , A.writeN -- drop new

47+ , writeN -- drop new

48− , A.write -- full buffer

48+ , write -- full buffer

49 , writeLastN -- drop old (ring buffer)

50

51 -- * Conversion

52 -- 'GHC.Exts.toList' from "GHC.Exts" can be used to convert an array to a

53 -- list.

54− , A.toList

54+ , toList

55

56 -- * Unfolds

57− , A.reader

57+ , reader

58− , A.readerRev

58+ , readerRev

59

60 -- * Casting

61 , cast

62 , asBytes

63

64 -- * Random Access

65− , A.length

65+ , length

66 -- , (!!)

67− , A.getIndex

67+ , getIndex

68

69 -- * Unbox Type Class

70 , Unbox (..)

@@ -82,12 +82,11 @@ where

82

83#include "inline.hs"

84

85+import Streamly.Internal.Data.Array hiding (read, readRev)

86+import Streamly.Internal.Data.Unbox (Unbox (..))

85import Streamly.Internal.Data.Unfold (Unfold)

87import Streamly.Internal.Data.Unfold (Unfold)

86−import Streamly.Internal.Data.Array as A hiding (read, readRev)

87−import Streamly.Internal.Data.Array.Type (pin, unpin, isPinned)

88

89−import Streamly.Internal.Data.Unbox (Unbox (..))

90−import Prelude hiding (read)

89+import Prelude hiding (read, length)

91

90

92#include "DocTestDataArray.hs"

91#include "DocTestDataArray.hs"

93

92

core/src/Streamly/Internal/Data/Array.hs+3−29

@@ -17,42 +17,27 @@ module Streamly.Internal.Data.Array

17 -- $design

18

19 -- * The Array Type

20− Array

20+ module Streamly.Internal.Data.Array.Type

21

22 -- * Construction

23−

24− -- Pure List APIs

25− , A.fromListN

26− , A.fromList

27−

28 -- Stream Folds

23 -- Stream Folds

29 , fromStreamN

24 , fromStreamN

30 , fromStream

25 , fromStream

31

26

32 -- Monadic Folds

27 -- Monadic Folds

33− , A.writeN -- drop new

34− , A.pinnedWriteNAligned

35− , A.write -- full buffer

36 , writeLastN

28 , writeLastN

37

29

38 -- * Elimination

30 -- * Elimination

39 -- ** Conversion

31 -- ** Conversion

40− , A.toList

41−

42− -- ** Streams

43− , A.read

44− , A.readRev

45

32

46 -- ** Unfolds

33 -- ** Unfolds

47 , reader

34 , reader

48 , readerUnsafe

35 , readerUnsafe

49− , A.readerRev

50 , producer -- experimental

36 , producer -- experimental

51

37

52 -- * Random Access

38 -- * Random Access

53 -- , (!!)

39 -- , (!!)

54 , getIndex

40 , getIndex

55− , A.unsafeIndex -- XXX Rename to getIndexUnsafe??

56 , getIndexRev

41 , getIndexRev

57 , last -- XXX getIndexLast?

42 , last -- XXX getIndexLast?

58 , getIndices

43 , getIndices

@@ -64,7 +49,6 @@ module Streamly.Internal.Data.Array

64 -- , getIndicesUptoRev -- read from end to the given position in file

49 -- , getIndicesUptoRev -- read from end to the given position in file

65

50

66 -- * Size

51 -- * Size

67− , length

68 , null

52 , null

69

53

70 -- * Search

54 -- * Search

@@ -77,10 +61,7 @@ module Streamly.Internal.Data.Array

77 , cast

61 , cast

78 , asBytes

62 , asBytes

79 , castUnsafe

63 , castUnsafe

80− , asPtrUnsafe

81 , asCStringUnsafe

64 , asCStringUnsafe

82− , A.unsafeFreeze -- asImmutableUnsafe?

83− , A.unsafeThaw -- asMutableUnsafe?

84

65

85 -- * Subarrays

66 -- * Subarrays

86 , getSliceUnsafe

67 , getSliceUnsafe

@@ -95,10 +76,6 @@ module Streamly.Internal.Data.Array

95 -- ** Folding

76 -- ** Folding

96 , streamFold

77 , streamFold

97 , fold

78 , fold

98−

99− -- * Deprecated

100− , A.toStream

101− , A.toStreamRev

102 )

79 )

103where

80where

104

81

@@ -117,9 +94,6 @@ import Foreign.Storable (Storable)

117import Streamly.Internal.Data.Unbox (Unbox(..))

94import Streamly.Internal.Data.Unbox (Unbox(..))

118import Prelude hiding (length, null, last, map, (!!), read, concat)

95import Prelude hiding (length, null, last, map, (!!), read, concat)

119

96

120−import Streamly.Internal.Data.MutArray.Type (ArrayUnsafe(..))

121−import Streamly.Internal.Data.Array.Type

122− (Array(..), length, asPtrUnsafe)

123import Streamly.Internal.Data.Fold.Type (Fold(..))

97import Streamly.Internal.Data.Fold.Type (Fold(..))

124import Streamly.Internal.Data.Producer.Type (Producer(..))

98import Streamly.Internal.Data.Producer.Type (Producer(..))

125import Streamly.Internal.Data.Stream (Stream)

99import Streamly.Internal.Data.Stream (Stream)

@@ -138,6 +112,8 @@ import qualified Streamly.Internal.Data.Stream as D

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

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

139import qualified Streamly.Internal.Data.Unfold as Unfold

113import qualified Streamly.Internal.Data.Unfold as Unfold

140

114

115+import Streamly.Internal.Data.Array.Type

116+

141#include "DocTestDataArray.hs"

117#include "DocTestDataArray.hs"

142

118

143-- $design

119-- $design

@@ -241,7 +217,6 @@ readerUnsafe = Unfold step inject

241

217

242-- |

218-- |

243--

219--

244−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array

245-- >>> null arr = Array.byteLength arr == 0

220-- >>> null arr = Array.byteLength arr == 0

246--

221--

247-- /Pre-release/

222-- /Pre-release/

@@ -264,7 +239,6 @@ getIndexRev i arr =

264

239

265-- |

240-- |

266--

241--

267−-- >>> import qualified Streamly.Internal.Data.Array as Array

268-- >>> last arr = Array.getIndexRev arr 0

242-- >>> last arr = Array.getIndexRev arr 0

269--

243--

270-- /Pre-release/

244-- /Pre-release/

core/src/Streamly/Internal/Data/Array/Type.hs−3

@@ -567,7 +567,6 @@ pinnedWrite = fmap unsafeFreeze MA.pinnedWrite

567-- could be unsafe and dangerous. This is dangerous especially when used with

568-- foldMany like operations.

569--

570−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array

571-- >>> unsafePureWrite = Array.unsafeMakePure Array.write

570-- >>> unsafePureWrite = Array.unsafeMakePure Array.write

572--

571--

573{-# INLINE unsafeMakePure #-}

572{-# INLINE unsafeMakePure #-}

@@ -595,8 +594,6 @@ fromPureStream x = unsafePerformIO $ fmap (unsafeFreeze) (MA.fromPureStream x)

595-- Note that this is completely safe when reading from Haskell string

594-- Note that this is completely safe when reading from Haskell string

596-- literals because they are guaranteed to be NULL terminated:

595-- literals because they are guaranteed to be NULL terminated:

597--

596--

598−-- >>> :set -XMagicHash

599−-- >>> import qualified Streamly.Internal.Data.Array.Type as Array

600-- >>> Array.toList $ Array.fromByteStr# "\1\2\3\0"#

597-- >>> Array.toList $ Array.fromByteStr# "\1\2\3\0"#

601-- [1,2,3]

598-- [1,2,3]

602--

599--

core/src/Streamly/Internal/Data/Fold/Chunked.hs+2−2

@@ -66,11 +66,11 @@ import Data.Proxy (Proxy(..))

66import Streamly.Internal.Data.Unbox (Unbox(..))

67import GHC.Types (SPEC(..))

68import Streamly.Internal.Data.MutArray.Type (touch)

69−import Streamly.Internal.Data.Array.Type (Array(..))

69+import Streamly.Internal.Data.Array (Array(..))

70import Streamly.Internal.Data.Parser (Initial(..), Step(..))

71import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

72

73−import qualified Streamly.Internal.Data.Array as Array

73+import qualified Streamly.Internal.Data.Array.Type as Array

74import qualified Streamly.Internal.Data.Fold as Fold

75import qualified Streamly.Internal.Data.Parser as ParserD

76import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD

core/src/Streamly/Internal/Data/Stream/Chunked.hs−1

@@ -87,7 +87,6 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

87import qualified Streamly.Data.Fold as FL

88import qualified Streamly.Internal.Data.Array as A

89import qualified Streamly.Internal.Data.Array as Array

90−import qualified Streamly.Internal.Data.Array.Type as A

91import qualified Streamly.Internal.Data.MutArray.Type as MA

90import qualified Streamly.Internal.Data.MutArray.Type as MA

92import qualified Streamly.Internal.Data.Stream.MutChunked as AS

91import qualified Streamly.Internal.Data.Stream.MutChunked as AS

93import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

92import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

core/streamly-core.cabal+2−1

@@ -308,7 +308,6 @@ library

308 -- May depend on streamly-core-stream

309 , Streamly.Internal.Data.MutArray.Type

310 , Streamly.Internal.Data.MutArray

311− , Streamly.Internal.Data.Array.Type

312 , Streamly.Internal.Data.MutArray.Generic

311 , Streamly.Internal.Data.MutArray.Generic

313

312

314 -- streamly-core-streams

313 -- streamly-core-streams

@@ -430,6 +429,8 @@ library

430 , Streamly.Internal.Data.Unfold.Type

429 , Streamly.Internal.Data.Unfold.Type

431 , Streamly.Internal.Data.Unfold.Enumeration

430 , Streamly.Internal.Data.Unfold.Enumeration

432

431

432+ , Streamly.Internal.Data.Array.Type

433+

433 if flag(dev)

434 if flag(dev)

434 other-modules:

435 other-modules:

435 Streamly.Internal.Data.Stream.StreamK.Alt

436 Streamly.Internal.Data.Stream.StreamK.Alt

src/Streamly/Internal/Data/Stream/IsStream/Common.hs+2−2

@@ -71,7 +71,7 @@ import Control.Concurrent (threadDelay)

71import Control.Monad.IO.Class (MonadIO(..))

72import Foreign.Storable (Storable)

73import Streamly.Internal.Control.Concurrent (MonadAsync)

74−import Streamly.Internal.Data.Array.Type (Array)

74+import Streamly.Internal.Data.Array (Array)

75import Streamly.Internal.Data.Fold (Fold (..))

76import Streamly.Internal.Data.Stream.IsStream.Combinators (maxYields)

77import Streamly.Internal.Data.Stream.IsStream.Type

@@ -81,7 +81,7 @@ import Streamly.Internal.Data.Time.Units (AbsTime, RelTime64, addToAbsTime64)

81import Streamly.Internal.System.IO (defaultChunkSize)

82import Streamly.Internal.Data.Unbox (Unbox)

83

84−import qualified Streamly.Internal.Data.Array.Type as A

84+import qualified Streamly.Internal.Data.Array as A

85import qualified Streamly.Internal.Data.Stream.Async as Async

86import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

87import qualified Streamly.Internal.Data.Stream.Parallel as Par

src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+2−2

@@ -164,7 +164,7 @@ import Streamly.Internal.Data.Fold (Fold (..))

164import Streamly.Internal.Data.IsMap (IsMap(..))

165import Streamly.Internal.Data.Refold.Type (Refold (..))

166import Streamly.Internal.Data.Parser (Parser (..), ParseError)

167−import Streamly.Internal.Data.Array.Type (Array)

167+import Streamly.Internal.Data.Array (Array)

168import Streamly.Internal.Data.Stream.IsStream.Common

169 ( fold

170 , interjectSuffix

@@ -184,7 +184,7 @@ import Streamly.Internal.Data.Unbox (Unbox)

184

185import qualified Data.Heap as H

186import qualified Streamly.Internal.Data.Unfold as Unfold

187−import qualified Streamly.Internal.Data.Array.Type as A

187+import qualified Streamly.Internal.Data.Array as A

188 (chunksOf, read)

189import qualified Streamly.Internal.Data.Fold as FL

190 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)

src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1

@@ -175,7 +175,7 @@ import GHC.IO.Handle.FD (fdToHandle)

175import Streamly.Internal.Data.Stream (Stream)

176import Streamly.Internal.Data.Cont (contListMap)

177import Streamly.Internal.Data.Parser (Parser)

178−import Streamly.Internal.Data.Array.Type (Array(..))

178+import Streamly.Internal.Data.Array (Array(..))

179import System.IO (Handle, hClose)

180

181import qualified Data.List.NonEmpty as NonEmpty

src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1

@@ -173,7 +173,7 @@ import GHC.IO.FD (fdFD, mkFD)

173import GHC.IO.Handle.FD (mkHandleFromFD)

174import Streamly.Internal.Data.Stream (Stream)

175import Streamly.Internal.Data.Parser (Parser)

176−import Streamly.Internal.Data.Array.Type (Array(..), byteLength)

176+import Streamly.Internal.Data.Array (Array(..), byteLength)

177import System.Directory (doesDirectoryExist)

178import System.IO (Handle, hClose, IOMode(ReadMode))

179import GHC.IO.Handle.FD (handleToFd)

src/Streamly/Internal/FileSystem/FD.hs+1−1

@@ -128,7 +128,7 @@ import Prelude hiding (read)

128import qualified GHC.IO.FD as FD

129import qualified GHC.IO.Device as RawIO

130

131−import Streamly.Internal.Data.Array.Type

131+import Streamly.Internal.Data.Array

132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)

133import Streamly.Internal.System.IO (defaultChunkSize)

134import Streamly.Internal.Data.Stream (Stream)

src/Streamly/Internal/Network/Inet/TCP.hs+2−2

@@ -106,7 +106,7 @@ import Prelude hiding (read)

106

107import Streamly.Internal.Control.Concurrent (MonadAsync)

108import Streamly.Internal.Control.ForkLifted (fork)

109−import Streamly.Internal.Data.Array.Type (Array(..), pinnedWriteNUnsafe)

109+import Streamly.Internal.Data.Array (Array(..), pinnedWriteNUnsafe)

110import Streamly.Internal.Data.Fold (Fold(..))

111import Streamly.Data.Stream (Stream)

112import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

@@ -121,7 +121,7 @@ import qualified Network.Socket as Net

121import qualified Streamly.Data.Array as A

122import qualified Streamly.Data.Fold as FL

123import qualified Streamly.Data.Unfold as UF

124−import qualified Streamly.Internal.Data.Array.Type as A

124+import qualified Streamly.Internal.Data.Array as A

125import qualified Streamly.Internal.Data.Unfold as UF (first, bracketIO)

126import qualified Streamly.Internal.Data.Fold as FL (Step(..), reduce)

127import qualified Streamly.Internal.Data.Stream as S

src/Streamly/Internal/Network/Socket.hs+2−2

@@ -86,7 +86,7 @@ import Prelude hiding (read)

86

87import qualified Network.Socket as Net

88

89−import Streamly.Internal.Data.Array.Type (Array(..))

89+import Streamly.Internal.Data.Array (Array(..))

90import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)

91import Streamly.Internal.Data.Fold (Fold)

92import Streamly.Internal.Data.Stream (Stream)

@@ -96,7 +96,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)

96

97import qualified Streamly.Data.Array as A (reader, length)

98import qualified Streamly.Data.Fold as FL

99−import qualified Streamly.Internal.Data.Array.Type as A

99+import qualified Streamly.Internal.Data.Array as A

100 (unsafeFreeze, asPtrUnsafe, byteLength, pinnedChunksOf, pinnedWriteN, pinnedWriteNUnsafe)

101import qualified Streamly.Internal.Data.MutArray as MArray

102 (MutArray(..), asPtrUnsafe, pinnedNewBytes)

src/Streamly/Internal/System/IOVec.hs+1−1

@@ -34,7 +34,7 @@ import Streamly.Internal.Data.MutArray.Type (length)

34import Streamly.Internal.Data.SVar.Type (adaptState)

35import Streamly.Internal.Data.MutArray.Type (Array(..))

36

37−import qualified Streamly.Internal.Data.Array.Type as Array

37+import qualified Streamly.Internal.Data.Array as Array

38import qualified Streamly.Internal.Data.MutArray.Type as MArray

39import qualified Streamly.Internal.Data.Stream as D

40-}

src/Streamly/Network/Socket.hs+1−1

@@ -137,7 +137,7 @@ import Control.Monad.IO.Class (MonadIO(..))

137import Data.Word (Word8)

138import Network.Socket (Socket, SockAddr)

139import Streamly.Internal.Data.Unfold (Unfold(..))

140−import Streamly.Internal.Data.Array.Type (Array(..))

140+import Streamly.Internal.Data.Array (Array(..))

141import Streamly.Internal.Data.Unbox (Unbox)

142

143import Streamly.Internal.Network.Socket hiding (accept, read, readChunks)

test/Streamly/Test/Data/Array.hs−1

@@ -19,7 +19,6 @@ import Streamly.Internal.Data.MutArray.Type (MutArray)

19import Test.QuickCheck (chooseInt, listOf)

20

21import qualified Streamly.Internal.Data.Array as A

22−import qualified Streamly.Internal.Data.Array.Type as A

23import qualified Streamly.Internal.Data.MutArray.Type as MA

22import qualified Streamly.Internal.Data.MutArray.Type as MA

24

23

25#include "Streamly/Test/Data/Array/CommonImports.hs"

24#include "Streamly/Test/Data/Array/CommonImports.hs"

test/Streamly/Test/Data/Ring/Unboxed.hs+1−1

@@ -10,7 +10,7 @@ module Streamly.Test.Data.Ring.Unboxed (main) where

10

11import Control.Monad (void)

12

13−import qualified Streamly.Internal.Data.Array.Type as Array

13+import qualified Streamly.Internal.Data.Array as Array

14import qualified Streamly.Internal.Data.Ring as Ring

15

16import Prelude as P