ed030cc · streamly · git.iko.soy

git.iko.soy/streamly

Rename some modules.

- Streamly.Internal.Memory.ArrayStream => Streamly.Internal.Data.Array.Stream.Foreign - Streamly.Memory.Ring => Streamly.Internal.Ring.Foreign - Streamly.FileSystem.IOVec => Streamly.Internal.FileSystem.IOVec - Streamly.FileSystem.FDIO => Streamly.Internal.FileSystem.FDIO - Streamly.FileSystem.FD => Streamly.Internal.FileSystem.FD Closes #873.

commited030cc13422ba7019133a003e2c5524514cbe26 authorPranay Sashank <pranaysashank@composewell.com> dateMon 1 Feb 2021, 12:40 (6 years ago) parent5c018c7

19 files changed+43−44

compare with master

unifiedsplit

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

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

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

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

4141import 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

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

4444import qualified Streamly.Prelude as S

4545import 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)

2929import qualified Streamly.FileSystem.Handle as FH

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

3131import 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

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

3434import qualified Streamly.Prelude as S

3535

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

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

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

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

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

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

26−-- once.

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

26+-- arrays at once.

2727--

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

2929-- 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

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

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

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

172−import qualified Streamly.Memory.Ring as RB

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

173173

174174-------------------------------------------------------------------------------

175175-- Construction

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

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

11-- |

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

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

44-- License : BSD3-3-Clause

55-- Maintainer : streamly@composewell.com

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

88--

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

1010--

11−module Streamly.Internal.Memory.ArrayStream

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

1212 (

1313 -- * Creation

1414 arraysOf

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

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

5151

5252#if !defined(mingw32_HOST_OS)

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

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

5454#endif

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

5656import 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(..))

3636#if !defined(mingw32_HOST_OS)

3737import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

3838import Foreign.Ptr (castPtr)

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

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

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

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

4242#endif

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

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

247247import Streamly.Internal.Data.Pipe.Types

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

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

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

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

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

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

253253-- 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

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

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

167167import 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

169169

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

171171import Streamly.Internal.Data.SVar

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

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

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

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

7676import 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

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

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

8080-- 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 @@

11#include "inline.hs"

33-- |

4−-- Module : Streamly.FileSystem.FD

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

66--

77-- License : BSD3

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

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

3030-- arrays.

3131--

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

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

3333--

3434

35−module Streamly.FileSystem.FD

35+module Streamly.Internal.FileSystem.FD

3636 (

3737 -- * File Handles

3838 Handle

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

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

138138

139139#if !defined(mingw32_HOST_OS)

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

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

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

142142import 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)

144144#endif

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

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

147147

148148import 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

150150import qualified Streamly.Prelude as S

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

152152

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

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

11#include "inline.hs"

33-- |

4−-- Module : Streamly.FileSystem.FDIO

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

77--

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

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

1414--

1515

16−module Streamly.FileSystem.FDIO

16+module Streamly.Internal.FileSystem.FDIO

1717 ( write

1818 , writeAll

1919 , IOVec (..)

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

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

3232#endif

3333import 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)

3535#endif

3636

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

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

4040

4141import GHC.IO.FD (FD(..))

4242

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

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

4444

4545-------------------------------------------------------------------------------

4646-- IO Routines

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

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

182182-- amount of data written.

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

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

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

185185

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

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

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

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

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

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

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

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

209209

210210-- XXX incomplete

211211-- | 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)

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

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

109109import 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

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

112112import qualified Streamly.Prelude as S

113113

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

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

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

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

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

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

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

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

123123

124124import qualified Streamly.Data.Fold as FL

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

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

127127import 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

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

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

131131import 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 @@

11-- |

2−-- Module : Streamly.FileSystem.IOVec

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

44--

55-- License : BSD3

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

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

1111--

1212

13−module Streamly.FileSystem.IOVec

13+module Streamly.Internal.FileSystem.IOVec

1414 ( IOVec(..)

1515 , c_writev

1616 , c_safe_writev

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

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

118118

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

120120import 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

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

123123import qualified Streamly.Prelude as S

124124import qualified Streamly.Network.Socket as SK

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

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

8989

9090import Streamly.Prelude (MonadAsync)

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

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

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

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

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

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

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

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

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

104104import 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

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

107107import qualified Streamly.Prelude as S

108108import 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 @@

11-- |

2−-- Module : Streamly.Memory.Ring

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

44-- License : BSD3

55-- Maintainer : streamly@composewell.com

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

77-- Portability : GHC

88--

10−module Streamly.Memory.Ring

10+module Streamly.Internal.Ring.Foreign

1111 ( Ring(..)

1212

1313 -- * Construction

streamly.cabal+7−8

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

377377 , Streamly.Data.Prim.Array

378378 , Streamly.Data.SmallArray

379379

380− -- Memory storage

381− , Streamly.Memory.Ring

382−

383− , Streamly.FileSystem.IOVec

384− , Streamly.FileSystem.FDIO

385− , Streamly.FileSystem.FD

386−

387380 exposed-modules:

388381 Streamly.Prelude

389382 , Streamly.Data.Unfold

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

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

504497 , Streamly.Internal.Data.SmallArray

505498 , 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

507503

508504 -- streamly-unicode

509505 , Streamly.Internal.Unicode.Stream

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

518514 , Streamly.Internal.FileSystem.Handle

519515 , Streamly.Internal.FileSystem.Dir

520516 , Streamly.Internal.FileSystem.File

517+ , Streamly.Internal.FileSystem.IOVec

518+ , Streamly.Internal.FileSystem.FDIO

519+ , Streamly.Internal.FileSystem.FD

521520

522521 -- streamly-network

523522 , Streamly.Internal.Network.Socket

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

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

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

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

3333import 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

3535type Array = A.Array

3636#elif defined(DATA_ARRAY_PRIM_PINNED)

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

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

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

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

1818

1919import 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

2121import qualified Streamly.Prelude as S

2222import qualified Streamly.Unicode.Stream as SS

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