ed030cc · streamly · git.iko.soy

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

compare with master

unifiedsplit

@@ -39,7 +39,7 @@ import qualified Streamly.Internal.Data.Fold as FL

39import qualified Streamly.Internal.Data.Parser as PR

40import qualified Streamly.Internal.Data.Stream.IsStream as IP

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

42−import qualified Streamly.Internal.Memory.ArrayStream as AS

42+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

43import qualified Streamly.Internal.Unicode.Stream as IUS

44import qualified Streamly.Prelude as S

45import qualified Streamly.Unicode.Stream as SS

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

@@ -29,7 +29,7 @@ import Streamly.Internal.Data.Array.Foreign.Types (defaultChunkSize)

29import qualified Streamly.FileSystem.Handle as FH

30import qualified Streamly.Internal.Data.Unfold as IUF

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

32−import qualified Streamly.Internal.Memory.ArrayStream as AS

32+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

33import qualified Streamly.Data.Array.Foreign as A

34import qualified Streamly.Prelude as S

35

src/Streamly/Internal/Data/Array/Foreign.hs+3−3

@@ -22,8 +22,8 @@

22-- less efficient compared to folding via streams. 'Semigroup' and 'Monoid'

23-- instances should be used with care; concatenating arrays using binary

24-- operations can be highly inefficient. Instead, use

25−-- 'Streamly.Internal.Memory.ArrayStream.toArray' to concatenate N arrays at

25+-- 'Streamly.Internal.Data.Array.Stream.Foreign.toArray' to concatenate N

26−-- once.

26+-- arrays at once.

27--

28-- Each array is one pointer visible to the GC. Too many small arrays (e.g.

29-- single byte) are only as good as holding those elements in a Haskell list.

@@ -169,7 +169,7 @@ import qualified Streamly.Internal.Data.Stream.Prelude as P

169import qualified Streamly.Internal.Data.Stream.Serial as Serial

170import qualified Streamly.Internal.Data.Stream.StreamD as D

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

172−import qualified Streamly.Memory.Ring as RB

172+import qualified Streamly.Internal.Ring.Foreign as RB

173

174-------------------------------------------------------------------------------

175-- Construction

src/Streamly/Internal/Memory/ArrayStream.hs → src/Streamly/Internal/Data/Array/Stream/Foreign.hsrenamed+3−3

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

1-- |

2−-- Module : Streamly.Internal.Memory.ArrayStream

2+-- Module : Streamly.Internal.Data.Array.Stream.Foreign

4-- License : BSD3-3-Clause

5-- Maintainer : streamly@composewell.com

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

8--

9-- Combinators to efficiently manipulate streams of immutable arrays.

10--

11−module Streamly.Internal.Memory.ArrayStream

11+module Streamly.Internal.Data.Array.Stream.Foreign

12 (

13 -- * Creation

14 arraysOf

@@ -50,7 +50,7 @@ import GHC.Ptr (Ptr(..))

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

51

52#if !defined(mingw32_HOST_OS)

53−import Streamly.FileSystem.FDIO (IOVec(..))

53+import Streamly.Internal.FileSystem.FDIO (IOVec(..))

54#endif

55import Streamly.Internal.Data.Array.Foreign.Types (Array(..), length)

56import Streamly.Internal.Data.Fold.Types (Fold(..))

src/Streamly/Internal/Data/Array/Stream/Mut/Foreign.hs+1−1

@@ -36,7 +36,7 @@ import Foreign.Storable (Storable(..))

36#if !defined(mingw32_HOST_OS)

37import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

38import Foreign.Ptr (castPtr)

39−import Streamly.FileSystem.FDIO (IOVec(..))

39+import Streamly.Internal.FileSystem.FDIO (IOVec(..))

40import Streamly.Internal.Data.Array.Foreign.Mut.Types (length)

41import Streamly.Internal.Data.SVar (adaptState)

42#endif

src/Streamly/Internal/Data/Pipe.hs+1−1

@@ -247,7 +247,7 @@ import Prelude

247import Streamly.Internal.Data.Pipe.Types

248 (Pipe(..), PipeState(..), Step(..), zipWith, tee, map, compose)

249-- import Streamly.Internal.Data.Array.Foreign.Types (Array)

250−-- import Streamly.Memory.Ring (Ring)

250+-- import Streamly.Internal.Ring.Foreign (Ring)

251-- import Streamly.Internal.Data.Stream.Serial (SerialT)

252-- import Streamly.Internal.Data.Stream.StreamK (IsStream())

253-- import Streamly.Internal.Data.Time.Units

src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs+1−1

@@ -165,7 +165,7 @@ import qualified Streamly.Internal.Data.Array.Foreign.Types as A

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

166import qualified Streamly.Internal.Data.Parser as PR

167import qualified Streamly.Internal.Data.Parser.ParserD as PRD

168−import qualified Streamly.Memory.Ring as RB

168+import qualified Streamly.Internal.Ring.Foreign as RB

169

170import Streamly.Internal.Data.Stream.StreamD.Type

171import Streamly.Internal.Data.SVar

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

@@ -74,7 +74,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (IsStream)

74-- import qualified Streamly.Data.Fold as FL

75-- import qualified Streamly.Internal.Data.Fold.Types as FL

76import qualified Streamly.Internal.Data.Unfold as UF

77−-- import qualified Streamly.Internal.Memory.ArrayStream as AS

77+-- import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

78import qualified Streamly.Internal.Data.Stream.IsStream as S

79-- import qualified Streamly.Data.Array.Foreign as A

80-- import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

src/Streamly/FileSystem/FD.hs → src/Streamly/Internal/FileSystem/FD.hsrenamed+6−6

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

1#include "inline.hs"

2

3-- |

4−-- Module : Streamly.FileSystem.FD

4+-- Module : Streamly.Internal.FileSystem.FD

6--

7-- License : BSD3

@@ -29,10 +29,10 @@

29-- be considered as in-memory files or files can be considered as on-disk

30-- arrays.

31--

32−-- > import qualified Streamly.FileSystem.FD as FD

32+-- > import qualified Streamly.Internal.FileSystem.FD as FD

33--

34

35−module Streamly.FileSystem.FD

35+module Streamly.Internal.FileSystem.FD

36 (

37 -- * File Handles

38 Handle

@@ -137,16 +137,16 @@ import Streamly.Internal.Data.Stream.Serial (SerialT)

137import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

138

139#if !defined(mingw32_HOST_OS)

140−import Streamly.Internal.Memory.ArrayStream (groupIOVecsOf)

140+import Streamly.Internal.Data.Array.Stream.Foreign (groupIOVecsOf)

141import Streamly.Internal.Data.Stream.StreamD (toStreamD)

142import Streamly.Internal.Data.Stream.StreamD.Type (fromStreamD)

143−import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

143+import qualified Streamly.Internal.FileSystem.FDIO as RawIO hiding (write)

144#endif

145-- import Streamly.Data.Fold (Fold)

146-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

147

148import qualified Streamly.Data.Array.Foreign as A

149−import qualified Streamly.Internal.Memory.ArrayStream as AS

149+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

150import qualified Streamly.Prelude as S

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

152

src/Streamly/FileSystem/FDIO.hs → src/Streamly/Internal/FileSystem/FDIO.hsrenamed+6−6

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

1#include "inline.hs"

2

3-- |

4−-- Module : Streamly.FileSystem.FDIO

4+-- Module : Streamly.Internal.FileSystem.FDIO

7--

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

13-- Low level IO routines interfacing the operating system.

14--

15

16−module Streamly.FileSystem.FDIO

16+module Streamly.Internal.FileSystem.FDIO

17 ( write

18 , writeAll

19 , IOVec (..)

@@ -31,7 +31,7 @@ import Foreign.C.Error (throwErrnoIfMinus1RetryMayBlock)

31import Foreign.C.Types (CBool(..))

32#endif

33import System.Posix.Internals (c_write, c_safe_write)

34−import Streamly.FileSystem.IOVec (c_writev, c_safe_writev)

34+import Streamly.Internal.FileSystem.IOVec (c_writev, c_safe_writev)

35#endif

36

37import Foreign.C.Types (CSize(..), CInt(..))

@@ -40,7 +40,7 @@ import Foreign.Ptr (plusPtr, Ptr)

40

41import GHC.IO.FD (FD(..))

42

43−import Streamly.FileSystem.IOVec (IOVec(..))

43+import Streamly.Internal.FileSystem.IOVec (IOVec(..))

44

45-------------------------------------------------------------------------------

46-- IO Routines

@@ -181,7 +181,7 @@ writeNonBlocking loc !fd !buf !off !len

181-- suspend the Haskell thread until write can proceed. Returns the actual

182-- amount of data written.

183write :: FD -> Ptr Word8 -> Int -> CSize -> IO CInt

184−write = writeNonBlocking "Streamly.FileSystem.FDIO"

184+write = writeNonBlocking "Streamly.Internal.FileSystem.FDIO"

185

186-- XXX sendAll for sockets has a similar code, we can deduplicate the two.

187-- XXX we need to check the errno to determine if the loop should continue. For

@@ -205,7 +205,7 @@ writeAll fd ptr bytes = do

205-- write will not block the OS thread, it may suspend the Haskell thread until

206-- write can proceed. Returns the actual amount of data written.

207writev :: FD -> Ptr IOVec -> Int -> IO CInt

208−writev = writevNonBlocking "Streamly.FileSystem.FDIO"

208+writev = writevNonBlocking "Streamly.Internal.FileSystem.FDIO"

209

210-- XXX incomplete

211-- | Keep writing an iovec in a loop until all the iovec entries are written.

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

@@ -107,7 +107,7 @@ import Streamly.Internal.Data.SVar (MonadAsync)

107import qualified Streamly.Internal.Data.Fold.Types as FL

108import qualified Streamly.Internal.Data.Unfold as UF

109import qualified Streamly.Internal.FileSystem.Handle as FH

110−import qualified Streamly.Internal.Memory.ArrayStream as AS

110+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

111import qualified Streamly.Data.Array.Foreign as A

112import qualified Streamly.Prelude as S

113

src/Streamly/Internal/FileSystem/Handle.hs+2−2

@@ -118,14 +118,14 @@ import Streamly.Internal.Data.Array.Foreign.Types

118import Streamly.Internal.Data.Array.Foreign.Mut.Types (mutableArray)

119import Streamly.Internal.Data.Stream.Serial (SerialT)

120import Streamly.Internal.Data.Stream.StreamK.Type (IsStream, mkStream)

121−import Streamly.Internal.Memory.ArrayStream (lpackArraysChunksOf)

121+import Streamly.Internal.Data.Array.Stream.Foreign (lpackArraysChunksOf)

122-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

123

124import qualified Streamly.Data.Fold as FL

125import qualified Streamly.Internal.Data.Fold.Types as FL

126import qualified Streamly.Internal.Data.Unfold as UF

127import qualified Streamly.Internal.Data.Array.Foreign as IA

128−import qualified Streamly.Internal.Memory.ArrayStream as AS

128+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

129import qualified Streamly.Internal.Data.Stream.IsStream as S

130import qualified Streamly.Data.Array.Foreign as A

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

src/Streamly/FileSystem/IOVec.hsc → src/Streamly/Internal/FileSystem/IOVec.hscrenamed+2−2

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

1-- |

2−-- Module : Streamly.FileSystem.IOVec

2+-- Module : Streamly.Internal.FileSystem.IOVec

4--

5-- License : BSD3

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

10-- Low level IO routines interfacing the operating system.

11--

12

13−module Streamly.FileSystem.IOVec

13+module Streamly.Internal.FileSystem.IOVec

14 ( IOVec(..)

15 , c_writev

16 , c_safe_writev

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

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

118

119import qualified Streamly.Internal.Data.Unfold as UF

120import qualified Streamly.Internal.Data.Array.Foreign as A

121−import qualified Streamly.Internal.Memory.ArrayStream as AS

121+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

122import qualified Streamly.Internal.Data.Fold.Types as FL

123import qualified Streamly.Prelude as S

124import qualified Streamly.Network.Socket as SK

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

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

89

90import Streamly.Prelude (MonadAsync)

91import Streamly.Internal.Data.Unfold.Types (Unfold(..))

92−import Streamly.Internal.Memory.ArrayStream (lpackArraysChunksOf)

92+import Streamly.Internal.Data.Array.Stream.Foreign (lpackArraysChunksOf)

93import Streamly.Internal.Data.Array.Foreign.Types (Array(..))

94import Streamly.Internal.Data.Array.Foreign.Mut.Types (mutableArray)

95import Streamly.Internal.Data.Stream.Serial (SerialT)

@@ -102,7 +102,7 @@ import qualified Streamly.Internal.Data.Fold.Types as FL

102import qualified Streamly.Internal.Data.Unfold as UF

103import qualified Streamly.Internal.Data.Array.Foreign as IA

104import qualified Streamly.Data.Array.Foreign as A

105−import qualified Streamly.Internal.Memory.ArrayStream as AS

105+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

106import qualified Streamly.Internal.Data.Array.Foreign.Types as A

107import qualified Streamly.Prelude as S

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

src/Streamly/Memory/Ring.hs → src/Streamly/Internal/Ring/Foreign.hsrenamed+2−2

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

1-- |

2−-- Module : Streamly.Memory.Ring

2+-- Module : Streamly.Internal.Ring.Foreign

4-- License : BSD3

5-- Maintainer : streamly@composewell.com

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

7-- Portability : GHC

8--

9

10−module Streamly.Memory.Ring

10+module Streamly.Internal.Ring.Foreign

11 ( Ring(..)

12

13 -- * Construction

streamly.cabal+7−8

@@ -377,13 +377,6 @@ library

377 , Streamly.Data.Prim.Array

378 , Streamly.Data.SmallArray

379

380− -- Memory storage

381− , Streamly.Memory.Ring

382−

383− , Streamly.FileSystem.IOVec

384− , Streamly.FileSystem.FDIO

385− , Streamly.FileSystem.FD

386−

387 exposed-modules:

380 exposed-modules:

388 Streamly.Prelude

381 Streamly.Prelude

389 , Streamly.Data.Unfold

382 , Streamly.Data.Unfold

@@ -503,7 +496,10 @@ library

503 , Streamly.Internal.Data.Array.Prim.Pinned

496 , Streamly.Internal.Data.Array.Prim.Pinned

504 , Streamly.Internal.Data.SmallArray

497 , Streamly.Internal.Data.SmallArray

505 , Streamly.Internal.Data.Array.Stream.Mut.Foreign

498 , Streamly.Internal.Data.Array.Stream.Mut.Foreign

506− , Streamly.Internal.Memory.ArrayStream

499+ , Streamly.Internal.Data.Array.Stream.Foreign

500+

501+ -- Memory storage

502+ , Streamly.Internal.Ring.Foreign

507

503

508 -- streamly-unicode

504 -- streamly-unicode

509 , Streamly.Internal.Unicode.Stream

505 , Streamly.Internal.Unicode.Stream

@@ -518,6 +514,9 @@ library

518 , Streamly.Internal.FileSystem.Handle

514 , Streamly.Internal.FileSystem.Handle

519 , Streamly.Internal.FileSystem.Dir

515 , Streamly.Internal.FileSystem.Dir

520 , Streamly.Internal.FileSystem.File

516 , Streamly.Internal.FileSystem.File

517+ , Streamly.Internal.FileSystem.IOVec

518+ , Streamly.Internal.FileSystem.FDIO

519+ , Streamly.Internal.FileSystem.FD

521

520

522 -- streamly-network

521 -- streamly-network

523 , Streamly.Internal.Network.Socket

522 , Streamly.Internal.Network.Socket

test/Streamly/Test/Common/Array.hs+1−1

@@ -31,7 +31,7 @@ import Data.Word(Word8)

31import qualified Streamly.Internal.Data.Array.Foreign as A

32import qualified Streamly.Internal.Data.Array.Foreign.Types as A

33import qualified Streamly.Internal.Data.Stream.IsStream as IP

34−import qualified Streamly.Internal.Memory.ArrayStream as AS

34+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

35type Array = A.Array

36#elif defined(DATA_ARRAY_PRIM_PINNED)

37import qualified Streamly.Internal.Data.Array.Prim.Pinned as A

test/Streamly/Test/Unicode/Stream.hs+1−1

@@ -17,7 +17,7 @@ import Test.QuickCheck

17import Test.QuickCheck.Monadic (run, monadicIO, assert)

18

19import qualified Streamly.Data.Array.Foreign as A

20−import qualified Streamly.Internal.Memory.ArrayStream as AS

20+import qualified Streamly.Internal.Data.Array.Stream.Foreign as AS

21import qualified Streamly.Prelude as S

22import qualified Streamly.Unicode.Stream as SS

23import qualified Streamly.Internal.Unicode.Stream as IUS