97e0d20 · streamly · git.iko.soy

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

compare with master

unifiedsplit

@@ -53,7 +53,7 @@ import Streamly.Benchmark.Common.Handle

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

54

55#ifdef INSPECTION

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

56+import Streamly.Internal.Data.Serialize (Unbox)

57import Streamly.Internal.Data.Stream (Step(..))

58import Test.Inspection

59#endif

benchmark/Streamly/Benchmark/Data/Serialize.hs+1−11

@@ -24,22 +24,12 @@ import System.Random (randomRIO)

24import Test.QuickCheck (Arbitrary, arbitrary)

25#endif

26

27+import Streamly.Internal.Data.Serialize hiding (encode)

27#ifdef USE_UNBOX

28#ifdef USE_UNBOX

28import Data.Proxy (Proxy(..))

29import Data.Proxy (Proxy(..))

29−import Streamly.Internal.Data.Unbox

30#else

31import Control.DeepSeq (force)

32import Test.QuickCheck (oneof, generate)

33−import Streamly.Internal.Data.Unbox (newBytes, MutableByteArray)

34−import Streamly.Internal.Data.Serialize hiding (encode)

35−#endif

36−

37−#ifdef USE_TH

38−#ifdef USE_UNBOX

39−import Streamly.Internal.Data.Unbox.TH

40−#else

41−import Streamly.Internal.Data.Serialize.TH

42−#endif

43#endif

33#endif

44

34

45import Test.Tasty.Bench

35import Test.Tasty.Bench

benchmark/Streamly/Benchmark/Data/Serialize/RecCompatible.hs+1−1

@@ -12,7 +12,7 @@ module Streamly.Benchmark.Data.Serialize.RecCompatible

12import Streamly.Internal.Data.Serialize (Serialize)

13import Streamly.Benchmark.Data.Serialize.TH (genLargeRecord)

14

15−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

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

16

17--------------------------------------------------------------------------------

18-- Code

benchmark/Streamly/Benchmark/Data/Serialize/RecNonCompatible.hs+1−1

@@ -11,7 +11,7 @@ module Streamly.Benchmark.Data.Serialize.RecNonCompatible

11

12import Streamly.Benchmark.Data.Serialize.TH (genLargeRecord)

13

14−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

14+import qualified Streamly.Internal.Data.Serialize as Serialize

15

16--------------------------------------------------------------------------------

17-- Code

benchmark/Streamly/Benchmark/Data/Serialize/TH.hs+1−1

@@ -8,7 +8,7 @@ module Streamly.Benchmark.Data.Serialize.TH (genLargeRecord) where

8

9import Language.Haskell.TH

10

11−import Streamly.Internal.Data.Serialize.TH.Bottom (makeI)

11+import Streamly.Internal.Data.Serialize (makeI)

12import Control.DeepSeq (NFData(..))

13

14--------------------------------------------------------------------------------

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

@@ -43,7 +43,7 @@ import Streamly.Benchmark.Common

43import Streamly.Benchmark.Common.Handle

44

45#ifdef INSPECTION

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

46+import Streamly.Internal.Data.Serialize (Unbox)

47import Streamly.Internal.Data.Stream (Step(..))

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

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

core/docs/Changelog.md+3−1

@@ -17,9 +17,11 @@

17* `ParserK` in `Streamly.Data.ParserK` is not specialized to arrays anymore. To

18 adapt to the new code, change `ParserK a m b` to `ParserK (Array a) m b` where

19 `Array` comes from `Streamly.Data.Array`.

20−* Internal modules renamed:

20+* Internal module changes:

21 * Streamly.Internal.Serialize.FromBytes -> Streamly.Internal.Data.Serialize.Parser

22 * Streamly.Internal.Serialize.ToBytes -> Streamly.Internal.Data.Serialize.Stream

23+ * Streamly.Internal.Data.Unbox is now exported via Streamly.Internal.Data.Serialize

24+ * Streamly.Internal.Data.IORef.Unboxed is now exported via Streamly.Internal.Data.Serialize

23

25

24### Deprecations

26### Deprecations

25

27

core/src/Streamly/Internal/Data/Serialize.hs+20−2

@@ -12,7 +12,19 @@

12--

13

14module Streamly.Internal.Data.Serialize

15+ (

16+ -- * Unbox

17+ module Streamly.Internal.Data.Unbox

18+ , module Streamly.Internal.Data.Unbox.TH

19+ -- * Unboxed IORef

20+ , module Streamly.Internal.Data.IORef.Unboxed

21+ -- * Serialize

15− ( module Streamly.Internal.Data.Serialize.Type

22+ , module Streamly.Internal.Data.Serialize.Type

23+ -- * Serialize TH

24+ , module Streamly.Internal.Data.Serialize.TH

25+ , module Streamly.Internal.Data.Serialize.TH.RecHeader

26+ , module Streamly.Internal.Data.Serialize.TH.Common

27+ , module Streamly.Internal.Data.Serialize.TH.Bottom

16 ) where

28 ) where

17

29

18--------------------------------------------------------------------------------

30--------------------------------------------------------------------------------

@@ -21,7 +33,6 @@ module Streamly.Internal.Data.Serialize

21

33

22import Data.Proxy (Proxy(..))

34import Data.Proxy (Proxy(..))

23import Streamly.Internal.Data.Array (Array(..))

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

24−import Streamly.Internal.Data.Unbox (MutableByteArray(..))

25import GHC.Exts (Int(..), sizeofByteArray#, unsafeCoerce#)

36import GHC.Exts (Int(..), sizeofByteArray#, unsafeCoerce#)

26import GHC.Word (Word8)

37import GHC.Word (Word8)

27

38

@@ -32,6 +43,13 @@ import GHC.Integer.GMP.Internals (Integer(..), BigNat(..))

32#endif

43#endif

33

44

34import Streamly.Internal.Data.Serialize.Type

45import Streamly.Internal.Data.Serialize.Type

46+import Streamly.Internal.Data.Unbox

47+import Streamly.Internal.Data.Unbox.TH

48+import Streamly.Internal.Data.Serialize.TH

49+import Streamly.Internal.Data.Serialize.TH.RecHeader

50+import Streamly.Internal.Data.Serialize.TH.Common

51+import Streamly.Internal.Data.Serialize.TH.Bottom

52+import Streamly.Internal.Data.IORef.Unboxed

35

53

36--------------------------------------------------------------------------------

54--------------------------------------------------------------------------------

37-- Common instances

55-- Common instances

core/src/Streamly/Internal/Data/Serialize/Type.hs+2−1

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

7--

8

9module Streamly.Internal.Data.Serialize.Type

10+ (

10− ( Serialize(..)

11+ Serialize(..)

11 , encode

12 , encode

12 , encodeAs

13 , encodeAs

13 , pinnedEncode

14 , pinnedEncode

core/streamly-core.cabal+8−8

@@ -292,18 +292,10 @@ library

292 , Streamly.Internal.Data.Producer

293

294 -- streamly-core-array-types

295− , Streamly.Internal.Data.Unbox

296 , Streamly.Internal.Data.Serialize

295 , Streamly.Internal.Data.Serialize

297− , Streamly.Internal.Data.Unbox.TH

298− , Streamly.Internal.Data.Serialize.TH

299− , Streamly.Internal.Data.Serialize.TH.RecHeader

300− , Streamly.Internal.Data.Serialize.TH.Common

301− , Streamly.Internal.Data.Serialize.TH.Bottom

302 , Streamly.Internal.Data.Serialize.Parser

296 , Streamly.Internal.Data.Serialize.Parser

303 , Streamly.Internal.Data.Serialize.Stream

297 , Streamly.Internal.Data.Serialize.Stream

304

298

305− -- Unboxed IORef

306− , Streamly.Internal.Data.IORef.Unboxed

307 -- May depend on streamly-core-stream

299 -- May depend on streamly-core-stream

308 , Streamly.Internal.Data.MutArray

300 , Streamly.Internal.Data.MutArray

309 , Streamly.Internal.Data.MutArray.Generic

301 , Streamly.Internal.Data.MutArray.Generic

@@ -429,7 +421,15 @@ library

429

421

430 , Streamly.Internal.Data.Array.Type

422 , Streamly.Internal.Data.Array.Type

431

423

424+ -- Unboxed IORef

425+ , Streamly.Internal.Data.Unbox

426+ , Streamly.Internal.Data.IORef.Unboxed

427+ , Streamly.Internal.Data.Unbox.TH

432 , Streamly.Internal.Data.Serialize.Type

428 , Streamly.Internal.Data.Serialize.Type

429+ , Streamly.Internal.Data.Serialize.TH

430+ , Streamly.Internal.Data.Serialize.TH.RecHeader

431+ , Streamly.Internal.Data.Serialize.TH.Common

432+ , Streamly.Internal.Data.Serialize.TH.Bottom

433

434 , Streamly.Internal.Data.Producer.Type

435 , Streamly.Internal.Data.Producer.Source

src/Streamly/Internal/Data/Stream/Concurrent.hs+1−1

@@ -112,7 +112,7 @@ import Streamly.Internal.Data.Stream.Channel.Types

112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)

113import Streamly.Internal.Data.Stream (Stream, Step(..))

114

115−import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

115+import qualified Streamly.Internal.Data.Serialize as Unboxed

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

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

118import qualified Streamly.Internal.Data.StreamK as K

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

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

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

80import Streamly.Internal.Data.Time.Units (AbsTime, RelTime64, addToAbsTime64)

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

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

82+import Streamly.Data.Serialize (Unbox)

83

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

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

src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+1−1

@@ -164,7 +164,7 @@ import Streamly.Internal.Data.Stream.IsStream.Common

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

165 (IsStream, fromStreamD, toStreamD)

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

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

167+import Streamly.Data.Serialize (Unbox)

168

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

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

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

@@ -103,9 +103,9 @@ import Streamly.Internal.Data.Stream.IsStream.Type

103 (IsStream (..), fromSerial, consM, fromStreamD)

104import Streamly.Internal.Data.Stream.Serial (SerialT, WSerialT)

105import Streamly.Internal.Data.Time.Units (AbsTime , RelTime64, addToAbsTime64)

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

106+import Streamly.Data.Serialize (Unbox)

107

108−import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

108+import qualified Streamly.Internal.Data.Serialize as Unboxed

109 (toStreamD, IORef)

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

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

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

@@ -180,7 +180,7 @@ import Streamly.Internal.Data.Stream.Serial(toStreamK)

180import Streamly.Internal.Data.Time.Units

181 ( AbsTime, MilliSecond64(..), addToAbsTime, toRelTime

182 , toAbsTime)

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

183+import Streamly.Data.Serialize (Unbox)

184

185import qualified Data.Heap as H

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

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

@@ -111,7 +111,7 @@ import Streamly.Internal.Data.Array (pinnedWriteNUnsafe)

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

112import Streamly.Data.Stream (Stream)

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

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

114+import Streamly.Data.Serialize (Unbox)

115import Streamly.Data.Unfold (Unfold)

116import Streamly.Internal.Network.Socket (SockSpec(..), accept, acceptor)

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

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

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

72import Data.Maybe (isNothing, fromJust)

73import Data.Word (Word8)

74import Foreign.Ptr (plusPtr, Ptr, castPtr)

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

75+import Streamly.Data.Serialize (Unbox)

76import Network.Socket

77 (Socket, SocketOption(..), Family(..), SockAddr(..),

78 ProtocolNumber, withSocketsDo, SocketType(..), socket, bind,

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

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

138import Network.Socket (Socket, SockAddr)

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

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

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

141+import Streamly.Data.Serialize (Unbox)

142

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

144import Prelude hiding (read)

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

@@ -14,7 +14,7 @@ import Data.Proxy (Proxy(..))

14import Data.Word(Word8)

15import Foreign.Storable (peek)

16import GHC.Ptr (plusPtr)

17−import Streamly.Internal.Data.Unbox (Unbox, sizeOf)

17+import Streamly.Internal.Data.Serialize (Unbox, sizeOf)

18import Streamly.Internal.Data.MutArray (MutArray)

19import Test.QuickCheck (chooseInt, listOf)

20

test/Streamly/Test/Data/MutArray.hs+1−1

@@ -13,7 +13,7 @@ import GHC.Int (Int16(..), Int32(..), Int64(..), Int8(..))

13import GHC.Real (Ratio(..))

14import GHC.Stable (StablePtr(..))

15import GHC.Word (Word16(..), Word32(..), Word64(..), Word8(..))

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

16+import Streamly.Internal.Data.Serialize (Unbox)

17import Streamly.Test.Common (chooseInt)

18import Test.Hspec (hspec, describe, it)

19import Test.Hspec.QuickCheck

test/Streamly/Test/Data/Serialize.hs+1−3

@@ -22,13 +22,11 @@ module Streamly.Test.Data.Serialize (main) where

22--------------------------------------------------------------------------------

23

24import System.Random (randomRIO)

25−import Streamly.Internal.Data.Unbox (MutableByteArray, newBytes)

25+import Streamly.Internal.Data.Serialize (MutableByteArray, newBytes)

26import GHC.Generics (Generic)

27import Streamly.Data.Serialize (Serialize)

28import Streamly.Test.Data.Serialize.TH (genDatatype)

29

30−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

31−

32import Data.Functor.Identity (Identity (..))

30import Data.Functor.Identity (Identity (..))

33

31

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

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

test/Streamly/Test/Data/Serialize/CompatV0.hs+1−1

@@ -11,7 +11,7 @@ module Streamly.Test.Data.Serialize.CompatV0

11

12import Test.QuickCheck (Arbitrary, arbitrary, elements)

13import Streamly.Internal.Data.Serialize (Serialize)

14−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

14+import qualified Streamly.Internal.Data.Serialize as Serialize

15

16--------------------------------------------------------------------------------

17-- Types

test/Streamly/Test/Data/Serialize/CompatV1.hs+1−1

@@ -11,7 +11,7 @@ module Streamly.Test.Data.Serialize.CompatV1

11

12import Test.QuickCheck (Arbitrary, arbitrary, elements)

13import Streamly.Internal.Data.Serialize (Serialize)

14−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

14+import qualified Streamly.Internal.Data.Serialize as Serialize

15

16--------------------------------------------------------------------------------

17-- Types

test/Streamly/Test/Data/Unbox.hs+3−25

@@ -27,32 +27,10 @@ import Data.Proxy (Proxy(..))

27import GHC.Generics (Generic, Rep(..))

28import GHC.Real (Ratio(..))

29

30+import Streamly.Internal.Data.Serialize

30#ifdef USE_SERIALIZE

31#ifdef USE_SERIALIZE

31−

32−import Streamly.Internal.Data.Serialize (Serialize(..))

33−import qualified Streamly.Internal.Data.Serialize.TH as Serialize

32+import qualified Streamly.Internal.Data.Serialize as Serialize

34−

35−#else

36−

37−#ifdef USE_TH

38−import Streamly.Internal.Data.Unbox.TH

39−#endif

40−

41−#endif

42−

43−import Streamly.Internal.Data.Unbox

44− ( PeekRep(..)

45− , PokeRep(..)

46− , SizeOfRep(..)

47− , Unbox(..)

48− , genericPeekByteIndex

49− , genericPokeByteIndex

50− , genericSizeOf

51− , newBytes

52−#ifndef USE_SERIALIZE

53− , MutableByteArray

54#endif

33#endif

55− )

56

34

57import Test.Hspec as H

35import Test.Hspec as H

58

36

@@ -271,7 +249,7 @@ testGenericConsistency val = do

271#ifndef USE_SERIALIZE

249#ifndef USE_SERIALIZE

272-- Size is also implicitly tested while serializing and deserializing.

250-- Size is also implicitly tested while serializing and deserializing.

273checkSizeOf :: forall a. Unbox a => Proxy a -> Int -> IO ()

251checkSizeOf :: forall a. Unbox a => Proxy a -> Int -> IO ()

274−checkSizeOf _ size = sizeOf (Proxy :: Proxy a) `shouldBe` size

252+checkSizeOf _ sz = sizeOf (Proxy :: Proxy a) `shouldBe` sz

275

253

276#endif

254#endif

277

255

test/Streamly/Test/Data/Unbox/TH.hs+2−3

@@ -15,8 +15,7 @@ module Streamly.Test.Data.Unbox.TH (main) where

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

16

17import Data.Proxy (Proxy(..))

18−import Streamly.Internal.Data.Unbox.TH

18+import Streamly.Internal.Data.Serialize

19−import Streamly.Internal.Data.Unbox (Unbox(..), newBytes, pokeByteIndex)

20

19

21import Test.Hspec as H

20import Test.Hspec as H

22

21

@@ -35,7 +34,7 @@ testSerialization val = do

35

34

36-- Size is also implicitly tested while serializing and deserializing.

35-- Size is also implicitly tested while serializing and deserializing.

37checkSizeOf :: forall a. Unbox a => Proxy a -> Int -> IO ()

36checkSizeOf :: forall a. Unbox a => Proxy a -> Int -> IO ()

38−checkSizeOf _ size = sizeOf (Proxy :: Proxy a) `shouldBe` size

37+checkSizeOf _ sz = sizeOf (Proxy :: Proxy a) `shouldBe` sz

39

38

40checkSizeOfNew :: forall a. Unbox a => String -> Proxy a -> Int -> Spec

39checkSizeOfNew :: forall a. Unbox a => String -> Proxy a -> Int -> Spec

41checkSizeOfNew tag proxy expectation =

40checkSizeOfNew tag proxy expectation =

test/Streamly/Test/Prelude/Serial.hs+1−1

@@ -26,7 +26,7 @@ import Data.Maybe ( isJust, fromJust )

26import Data.Word (Word8)

27import Data.Semigroup (Sum(..), getSum)

28import Foreign.Storable (Storable)

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

29+import Streamly.Internal.Data.Serialize (Unbox)

30import Test.Hspec.QuickCheck

31import Test.QuickCheck

32 ( Gen