@@ -31,57 +31,39 @@ module Streamly.Internal.Data.MutArray.Type
31 -- ** Type
31 -- ** Type
32 -- $arrayNotes
32 -- $arrayNotes
33 MutArray (..)
33 MutArray (..)
35− -- ** Conversion
35+ , MutableByteArray
36− -- *** Pinned and Unpinned
39 , isPinned
38 , isPinned
41− -- ** Casting
40+ -- -- * Constructing and Writing
43− , castUnsafe -- XXX unsafeCast
48 -- ** Construction
41 -- ** Construction
52− -- | New arrays are always empty arrays with some reserve capacity to
53− -- extend the length without reallocating.
55− , newArrayWith -- emptyAlignedWith
57− , pinnedNewAligned -- XXX not required
58− -- , new -- uninitialized array of specified length
64− -- *** Slicing
44+ -- *** Uninitialized Arrays
65− -- | Get a subarray without copying
45+ , pinnedNew
66− , getSliceUnsafe -- XXX unsafeGetSlice
46+ , pinnedNewBytes
67− , getSlice
47+ , pinnedNewAligned
68− , splitAt -- XXX should be able to express using getSlice
48+ , new
69− , breakOn
49+ , newArrayWith
71− -- *** Stream Folds
51+ -- *** From streams
72 , ArrayUnsafe (..)
52 , ArrayUnsafe (..)
73− , unsafeCreateOfWith
53+ , writeNWithUnsafe
74− , unsafeCreateOf
54+ , writeNWith
75− , unsafePinnedCreateOf
55+ , writeNUnsafe
76− , pinnedCreateOf
56+ , pinnedWriteNUnsafe
77− , createOfWith
57+ , writeN
78− , createOf
58+ , pinnedWriteN
79− , revCreateOf
59+ , pinnedWriteNAligned
81− , pinnedCreate
61+ , writeWith
82− , createWith
62+ , write
83− , create
63+ , pinnedWrite
86 -- *** From containers
68 -- *** From containers
87 , fromListN
69 , fromListN
@@ -97,11 +79,11 @@ module Streamly.Internal.Data.MutArray.Type
97 , fromByteStr#
79 , fromByteStr#
98 , fromPtrN
80 , fromPtrN
99 , fromChunksK
81 , fromChunksK
100− , fromChunksRealloced -- fromSmallChunks
82+ , fromChunksRealloced
102 -- ** Random writes
84 -- ** Random writes
103 , putIndex
85 , putIndex
104− , putIndexUnsafe -- XXX unsafePutIndex
86+ , putIndexUnsafe
105 , putIndices
87 , putIndices
106 -- , putFromThenTo
88 -- , putFromThenTo
107 -- , putFrom -- start writing at the given position
89 -- , putFrom -- start writing at the given position
@@ -109,69 +91,76 @@ module Streamly.Internal.Data.MutArray.Type
109 -- , putFromTo
91 -- , putFromTo
110 -- , putFromRev
92 -- , putFromRev
111 -- , putUptoRev
93 -- , putUptoRev
112− , modifyIndexUnsafe -- XXX unsafeModifyIndex
94+ , modifyIndexUnsafe
113 , modifyIndex
95 , modifyIndex
114 , modifyIndices
96 , modifyIndices
116 , swapIndices
98 , swapIndices
117 , unsafeSwapIndices
99 , unsafeSwapIndices
119− -- ** Reading
101+ -- ** Growing and Shrinking
102+ -- | Arrays grow only at the end, though it is possible to grow on both sides
103+ -- and therefore have a cons as well as snoc. But that will require two
104+ -- bounds in the array representation.
121− -- *** Indexing
106+ -- *** Appending elements
122− , getIndex
107+ , snocWith
123− , getIndexUnsafe -- XXX unsafeGetIndex
108+ , snoc
124− -- , getFromThenTo
109+ , snocLinear
125− , getIndexRev -- getRevIndex?
110+ , snocMay
126− , indexReader
111+ , snocUnsafe
127− , indexReaderWith
112+
113+ -- *** Appending streams
114+ , writeAppendNUnsafe
119+ -- ** Eliminating and Reading
129− -- *** To Streams
126+ -- *** To containers
131 , readRev
132 , readRev
134 , toStreamK
133 , toStreamK
136 , toStreamKRev
134 , toStreamKRev
139− -- *** To Containers
143 -- experimental
137 -- experimental
144 , producerWith
138 , producerWith
145 , producer
139 , producer
147− , reader
141+ -- *** Random reads
148− , readerRevWith
142+ , getIndex
149− , readerRev
143+ , getIndexUnsafe
151− -- ** Size and Capacity
145+ , getIndicesD
152− -- *** Size
146+ -- , getFromThenTo
153− , length
147+ , getIndexRev
161− -- *** Capacity Management
149+ -- ** Memory Management
162 , blockSize
150 , blockSize
163 , arrayChunkBytes
151 , arrayChunkBytes
164 , allocBytesToElemCount
152 , allocBytesToElemCount
165− , realloc -- this is "resize"
153+ , realloc
167− , growExp
155+ , resizeExp
168 , rightSize
156 , rightSize
170− -- ** Folding
158+ -- ** Size
171− , foldl'
159+ , length
172− , foldr
160+ , byteLength
173− , byteCmp
161+ -- , capacity
174− , byteEq
162+ , byteCapacity
176 -- ** In-place Mutation Algorithms
165 -- ** In-place Mutation Algorithms
@@ -183,82 +172,58 @@ module Streamly.Internal.Data.MutArray.Type
183 , mergeBy
172 , mergeBy
186− -- ** Growing and Shrinking
175+ -- ** Casting
187− -- | Arrays grow only at the end, though it is possible to grow on both
176+ , cast
188− -- sides and therefore have a cons as well as snoc. But that will require
177+ , castUnsafe
189− -- both lower and upper bound in the array representation.
178+ , asBytes
191− -- *** Appending elements
180+ , asUnpinnedPtrUnsafe
196− , snocUnsafe -- XXX unsafeSnoc
198− -- *** Appending streams
204− -- *** Appending arrays
209− , spliceUnsafe -- XXX unsafeSplice
212− -- , appendSliceFrom
214− -- ** Serialization using Unbox
217− , pokeSkipUnsafe -- unsafePokeSkip
219− -- ** Deserialization using Unbox
182+ -- ** Folding
220− , peekUncons
183+ , foldl'
221− , peekUnconsUnsafe -- unsafePeekUncons
184+ , foldr
222− , peekSkipUnsafe -- unsafePeekSkip
185+ , cmp
224− -- Arrays of arrays
189+ -- ** Arrays of arrays
225 -- We can add dimensionality parameter to the array type to get
190 -- We can add dimensionality parameter to the array type to get
226 -- multidimensional arrays. Multidimensional arrays would just be a
191 -- multidimensional arrays. Multidimensional arrays would just be a
227 -- convenience wrapper on top of single dimensional arrays.
192 -- convenience wrapper on top of single dimensional arrays.
229− -- ** Streams of Arrays
194+ -- | Operations dealing with multiple arrays, streams of arrays or
230− -- *** Chunk
195+ -- multidimensional array representations.
231− -- | Group a stream into arrays.
196+
197+ -- *** Construct from streams
232 , chunksOf
198 , chunksOf
233 , pinnedChunksOf
199 , pinnedChunksOf
234 , buildChunks
200 , buildChunks
236− -- *** Split
202+ -- *** Eliminate to streams
237− -- | Split an array into slices.
203+ , concatChunks
206+ -- *** Construct from arrays
207+ -- get chunks without copying
239 -- , getSlicesFromLenN
210 -- , getSlicesFromLenN
240− , splitOn
211+ , splitAt -- XXX should be able to express using getSlice
241− -- , slicesOf
212+ , breakOn
243− -- *** Concat
214+ -- ** Cloning arrays
244− -- | Append the arrays in a stream to form a stream of elements.
215+ , clone
245− , concatWith
216+ , pinnedClone
247− , concat
218+ -- ** Appending arrays
248− , concatRev
219+ , spliceCopy
250− -- *** Compact
221+ , splice
251− -- | Append the arrays in a stream to form a stream of larger arrays.
222+ , spliceExp
252− , SpliceState (..)
223+ , spliceUnsafe
253− , pCompactLE
224+ -- , putSlice
254− , pPinnedCompactLE
225+ -- , appendSlice
255− , compactLeAs
226+ -- , appendSliceFrom
263 -- ** Utilities
228 -- ** Utilities
264 , roundUpToPower2
229 , roundUpToPower2
@@ -267,37 +232,12 @@ module Streamly.Internal.Data.MutArray.Type
267 , c_memchr
232 , c_memchr
269 -- * Deprecated
234 -- * Deprecated
271 , writeChunks
235 , writeChunks
272 , flattenArrays
236 , flattenArrays
273 , flattenArraysRev
237 , flattenArraysRev
274 , fromArrayStreamK
238 , fromArrayStreamK
275 , fromStreamDN
239 , fromStreamDN
276 , fromStreamD
240 , fromStreamD
286− , writeAppendNUnsafe
293− , pinnedWriteNUnsafe
296− , pinnedWriteNAligned -- XXX not required
@@ -308,7 +248,6 @@ where
309import Control.Monad (when, void)
249import Control.Monad (when, void)
310import Control.Monad.IO.Class (MonadIO(..))
250import Control.Monad.IO.Class (MonadIO(..))
311−import Data.Bifunctor (first)
312import Data.Bits (shiftR, (.|.), (.&.))
251import Data.Bits (shiftR, (.|.), (.&.))
313import Data.Functor.Identity (Identity(..))
252import Data.Functor.Identity (Identity(..))
314import Data.Proxy (Proxy(..))
253import Data.Proxy (Proxy(..))
@@ -317,6 +256,7 @@ import Foreign.C.Types (CSize(..), CInt(..))
317import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
256import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
318import Streamly.Internal.Data.MutByteArray.Type
257import Streamly.Internal.Data.MutByteArray.Type
319 ( MutByteArray(..)
258 ( MutByteArray(..)
320 , PinnedState(..)
260 , PinnedState(..)
321 , getMutableByteArray#
261 , getMutableByteArray#
322 , putSliceUnsafe
262 , putSliceUnsafe
@@ -335,17 +275,13 @@ import GHC.Ptr (Ptr(..))
335import Streamly.Internal.Data.Fold.Type (Fold(..))
275import Streamly.Internal.Data.Fold.Type (Fold(..))
336import Streamly.Internal.Data.Producer.Type (Producer (..))
276import Streamly.Internal.Data.Producer.Type (Producer (..))
337import Streamly.Internal.Data.Stream.Type (Stream)
277import Streamly.Internal.Data.Stream.Type (Stream)
338−import Streamly.Internal.Data.Parser.Type (Parser (..))
339import Streamly.Internal.Data.StreamK.Type (StreamK)
278import Streamly.Internal.Data.StreamK.Type (StreamK)
340import Streamly.Internal.Data.SVar.Type (adaptState, defState)
279import Streamly.Internal.Data.SVar.Type (adaptState, defState)
341−import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
342import Streamly.Internal.Data.Unfold.Type (Unfold(..))
280import Streamly.Internal.Data.Unfold.Type (Unfold(..))
343import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
281import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
345import qualified Streamly.Internal.Data.Fold.Type as FL
283import qualified Streamly.Internal.Data.Fold.Type as FL
346import qualified Streamly.Internal.Data.MutByteArray.Type as Unboxed
284import qualified Streamly.Internal.Data.MutByteArray.Type as Unboxed
347−import qualified Streamly.Internal.Data.Parser.Type as Parser
348−-- import qualified Streamly.Internal.Data.Fold.Type as Fold
349import qualified Streamly.Internal.Data.Producer as Producer
285import qualified Streamly.Internal.Data.Producer as Producer
350import qualified Streamly.Internal.Data.Stream.Type as D
286import qualified Streamly.Internal.Data.Stream.Type as D
351import qualified Streamly.Internal.Data.Stream.Lift as D
287import qualified Streamly.Internal.Data.Stream.Lift as D
@@ -353,7 +289,7 @@ import qualified Streamly.Internal.Data.StreamK.Type as K
353import qualified Prelude
289import qualified Prelude
355import Prelude hiding
291import Prelude hiding
356− (Foldable(..), concat, read, unlines, splitAt, reverse, truncate)
292+ (Foldable(..), read, unlines, splitAt, reverse, truncate)
358#include "DocTestDataMutArray.hs"
294#include "DocTestDataMutArray.hs"
@@ -479,8 +415,6 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
479-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
415-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
480-- allocatePinned in GHC source.
416-- allocatePinned in GHC source.
482−-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
484-- | @newArrayWith allocator alignment count@ allocates a new array of zero
418-- | @newArrayWith allocator alignment count@ allocates a new array of zero
485-- length and with a capacity to hold @count@ elements, using @allocator
419-- length and with a capacity to hold @count@ elements, using @allocator
486-- size alignment@ as the memory allocator function.
420-- size alignment@ as the memory allocator function.
@@ -504,25 +438,12 @@ newArrayWith alloc alignSize count = do
504 , arrBound = size
438 , arrBound = size
507−-- For arrays "nil" sounds a bit odd. empty is better. The only problem with
508−-- empty is that it is also used by the Alternative type class. But assuming we
509−-- will mostly import the Array module qualified this should be fine.
511−-- | Create an empty array.
517−empty = MutArray Unboxed.empty 0 0 0
519−{-# DEPRECATED nil "Please use empty instead." #-}
521#ifdef DEVBUILD
442#ifdef DEVBUILD
522 Unbox a =>
443 Unbox a =>
524 MutArray a
445 MutArray a
525−nil = empty
446+nil = MutArray Unboxed.nil 0 0 0
527{-# INLINE newBytesAs #-}
448{-# INLINE newBytesAs #-}
528newBytesAs :: MonadIO m =>
449newBytesAs :: MonadIO m =>
@@ -539,13 +460,12 @@ newBytesAs ps bytes = do
539 , arrBound = bytes
460 , arrBound = bytes
542−-- | Allocates a pinned empty array that with a reserved capacity of bytes.
463+-- | Allocates a pinned empty array that can hold 'count' items. The memory of
543−-- The memory of the array is uninitialized and the allocation is aligned as
464+-- the array is uninitialized and the allocation is aligned as per the
544−-- per the 'Unboxed' instance of the type.
465+-- 'Unboxed' instance of the type.
546-- /Pre-release/
467-- /Pre-release/
547{-# INLINE pinnedNewBytes #-}
468{-# INLINE pinnedNewBytes #-}
548−{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
549pinnedNewBytes :: MonadIO m =>
469pinnedNewBytes :: MonadIO m =>
550#ifdef DEVBUILD
470#ifdef DEVBUILD
551 Unbox a =>
471 Unbox a =>
@@ -570,31 +490,21 @@ newAs ps =
570 (error "new: alignment is not used in unpinned arrays.")
490 (error "new: alignment is not used in unpinned arrays.")
572-- XXX can unaligned allocation be more efficient when alignment is not needed?
492-- XXX can unaligned allocation be more efficient when alignment is not needed?
574−-- | Allocates a pinned array of zero length but growable to the specified
494+-- | Allocates an empty pinned array that can hold 'count' items. The memory of
575−-- capacity without reallocation.
495+-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
576−{-# INLINE pinnedEmptyOf #-}
496+-- instance of the type.
577−pinnedEmptyOf :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
497+--
578−pinnedEmptyOf = newAs Pinned
580−-- XXX Deprecate in major
581−-- {-# DEPRECATED pinnedNew "Please use pinnedEmptyOf instead." #-}
582{-# INLINE pinnedNew #-}
498{-# INLINE pinnedNew #-}
583pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
499pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
584−pinnedNew = pinnedEmptyOf
500+pinnedNew = newAs Pinned
586−-- | Allocates an unpinned array of zero length but growable to the specified
502+-- | Allocates an empty unpinned array that can hold 'count' items. The memory
587−-- capacity without reallocation.
503+-- of the array is uninitialized.
589−{-# INLINE emptyOf #-}
590−emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591−emptyOf = newAs Unpinned
593−-- XXX Deprecate in major
594−-- {-# DEPRECATED new "Please use emptyOf instead." #-}
595{-# INLINE new #-}
505{-# INLINE new #-}
596new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
506new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
597−new = emptyOf
507+new = newAs Unpinned
599-------------------------------------------------------------------------------
509-------------------------------------------------------------------------------
600-- Random writes
510-- Random writes
@@ -642,7 +552,7 @@ putIndices arr = FL.foldlM' step (return ())
645− step () (i, x) = putIndex i arr x
555+ step () (i, x) = liftIO (putIndex i arr x)
647-- | Modify a given index of an array using a modifier function.
557-- | Modify a given index of an array using a modifier function.
@@ -838,19 +748,22 @@ arrayChunkBytes = 1024
838roundDownTo :: Int -> Int -> Int
748roundDownTo :: Int -> Int -> Int
839roundDownTo elemSize size = size - (size `mod` elemSize)
749roundDownTo elemSize size = size - (size `mod` elemSize)
751+-- XXX See if resizing can be implemented by reading the old array as a stream
752+-- and then using writeN to the new array.
841-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
754-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
842-- Since this is not inlined Unboxed consrraint leads to dictionary passing
755-- Since this is not inlined Unboxed consrraint leads to dictionary passing
843-- which complicates some inspection tests.
756-- which complicates some inspection tests.
845−{-# NOINLINE reallocExplicitAs #-}
758+{-# NOINLINE reallocExplicit #-}
846−reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
759+reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
847−reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
760+reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
848 assertM(arrEnd <= arrBound)
761 assertM(arrEnd <= arrBound)
850 -- Allocate new array
763 -- Allocate new array
851 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
764 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
852 contents <-
765 contents <-
853− if ps == Pinned
766+ if Unboxed.isPinned arrContents
854 then Unboxed.pinnedNew newCapMaxInBytes
767 then Unboxed.pinnedNew newCapMaxInBytes
855 else Unboxed.new newCapMaxInBytes
768 else Unboxed.new newCapMaxInBytes
856 let !(MutByteArray mbarrFrom#) = arrContents
769 let !(MutByteArray mbarrFrom#) = arrContents
@@ -875,10 +788,6 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
875 , arrBound = newCapInBytes
788 , arrBound = newCapInBytes
878−-- XXX Should these be called reallocBytes etc?
879−-- XXX We may also need reallocAs to allocate as pinned/unpinned explicitly. In
880−-- fact clone/pinnedClone can be implemented using reallocAs.
882-- | @realloc newCapacity array@ reallocates the array to the specified
791-- | @realloc newCapacity array@ reallocates the array to the specified
883-- capacity in bytes.
792-- capacity in bytes.
@@ -890,12 +799,7 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
890-- If the original array is pinned, the newly allocated array is also pinned.
799-- If the original array is pinned, the newly allocated array is also pinned.
891{-# INLINABLE realloc #-}
800{-# INLINABLE realloc #-}
892realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
801realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
898− in liftIO $ reallocExplicitAs ps (SIZE_OF(a)) bytes arr
802+realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
900-- | @reallocWith label capSizer minIncrBytes array@. The label is used
804-- | @reallocWith label capSizer minIncrBytes array@. The label is used
901-- in error messages and the capSizer is used to determine the capacity of the
805-- in error messages and the capSizer is used to determine the capacity of the
@@ -918,14 +822,14 @@ reallocWith label capSizer minIncrBytes arr = do
920 badSize newSize =
824 badSize newSize =
921− Prelude.concat
825+ concat
923 , ": new array size (in bytes) is less than required size "
827 , ": new array size (in bytes) is less than required size "
924 , show newSize
828 , show newSize
925 , ". Please check the sizing function passed."
829 , ". Please check the sizing function passed."
928−-- | @grow newCapacity array@ changes the total capacity of the array so that
832+-- | @resize newCapacity array@ changes the total capacity of the array so that
929-- it is enough to hold the specified number of elements. Nothing is done if
833-- it is enough to hold the specified number of elements. Nothing is done if
930-- the specified capacity is less than the length of the array.
834-- the specified capacity is less than the length of the array.
@@ -933,46 +837,34 @@ reallocWith label capSizer minIncrBytes arr = do
933-- the block size (4K).
837-- the block size (4K).
935-- /Pre-release/
839-- /Pre-release/
936−{-# INLINE grow #-}
840+{-# INLINE resize #-}
937−grow :: forall m a. (MonadIO m, Unbox a) =>
841+resize :: forall m a. (MonadIO m, Unbox a) =>
938 Int -> MutArray a -> m (MutArray a)
842 Int -> MutArray a -> m (MutArray a)
939−grow nElems arr@MutArray{..} = do
843+resize nElems arr@MutArray{..} = do
940 let req = SIZE_OF(a) * nElems
844 let req = SIZE_OF(a) * nElems
941− cap = arrBound - arrStart
845+ len = arrEnd - arrStart
942− if req < cap
846+ if req < len
943 then return arr
847 then return arr
944 else realloc req arr
848 else realloc req arr
946−{-# DEPRECATED resize "Please use grow instead." #-}
947−{-# INLINE resize #-}
948−resize :: forall m a. (MonadIO m, Unbox a) =>
949− Int -> MutArray a -> m (MutArray a)
952−-- | Like 'grow' but if the requested byte capacity is more than
850+-- | Like 'resize' but if the byte capacity is more than 'largeObjectThreshold'
953−-- 'largeObjectThreshold' then it is rounded up to the closest power of 2.
851+-- then it is rounded up to the closest power of 2.
955-- /Pre-release/
853-- /Pre-release/
956−{-# INLINE growExp #-}
854+{-# INLINE resizeExp #-}
957−growExp :: forall m a. (MonadIO m, Unbox a) =>
855+resizeExp :: forall m a. (MonadIO m, Unbox a) =>
958 Int -> MutArray a -> m (MutArray a)
856 Int -> MutArray a -> m (MutArray a)
959−growExp nElems arr@MutArray{..} = do
857+resizeExp nElems arr@MutArray{..} = do
960 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
858 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
962 if req > largeObjectThreshold
860 if req > largeObjectThreshold
963 then roundUpToPower2 req
861 then roundUpToPower2 req
965− cap = arrBound - arrStart
863+ len = arrEnd - arrStart
966− if req1 < cap
864+ if req1 < len
967 then return arr
865 then return arr
968 else realloc req1 arr
866 else realloc req1 arr
970−{-# DEPRECATED resizeExp "Please use growExp instead." #-}
971−{-# INLINE resizeExp #-}
972−resizeExp :: forall m a. (MonadIO m, Unbox a) =>
973− Int -> MutArray a -> m (MutArray a)
976-- | Resize the allocated memory to drop any reserved free space at the end of
868-- | Resize the allocated memory to drop any reserved free space at the end of
977-- the array and reallocate it to reduce wastage.
869-- the array and reallocate it to reduce wastage.
@@ -1037,7 +929,7 @@ snocUnsafe arr@MutArray{..} = snocNewEnd (INDEX_NEXT(arrEnd,a)) arr
1037{-# INLINE snocMay #-}
929{-# INLINE snocMay #-}
1038snocMay :: forall m a. (MonadIO m, Unbox a) =>
930snocMay :: forall m a. (MonadIO m, Unbox a) =>
1039 MutArray a -> a -> m (Maybe (MutArray a))
931 MutArray a -> a -> m (Maybe (MutArray a))
1040−snocMay arr@MutArray{..} x = do
932+snocMay arr@MutArray{..} x = liftIO $ do
1041 let newEnd = INDEX_NEXT(arrEnd,a)
933 let newEnd = INDEX_NEXT(arrEnd,a)
1042 if newEnd <= arrBound
934 if newEnd <= arrBound
1043 then Just <$> snocNewEnd newEnd arr x
935 then Just <$> snocNewEnd newEnd arr x
@@ -1051,7 +943,7 @@ snocWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1052 -> m (MutArray a)
944 -> m (MutArray a)
1053snocWithRealloc sizer arr x = do
945snocWithRealloc sizer arr x = do
1054− arr1 <- reallocWith "snocWith" sizer (SIZE_OF(a)) arr
946+ arr1 <- liftIO $ reallocWith "snocWith" sizer (SIZE_OF(a)) arr
1055 snocUnsafe arr1 x
947 snocUnsafe arr1 x
1057-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
949-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
@@ -1073,7 +965,7 @@ snocWith :: forall m a. (MonadIO m, Unbox a) =>
1073 -> MutArray a
965 -> MutArray a
1075 -> m (MutArray a)
967 -> m (MutArray a)
1076−snocWith allocSize arr x = do
968+snocWith allocSize arr x = liftIO $ do
1077 let newEnd = INDEX_NEXT(arrEnd arr,a)
969 let newEnd = INDEX_NEXT(arrEnd arr,a)
1078 if newEnd <= arrBound arr
970 if newEnd <= arrBound arr
1079 then snocNewEnd newEnd arr x
971 then snocNewEnd newEnd arr x
@@ -1117,126 +1009,6 @@ snoc = snocWith f
1117 then oldSize * 2
1009 then oldSize * 2
1118 else roundUpToPower2 oldSize * 2
1010 else roundUpToPower2 oldSize * 2
1120−-------------------------------------------------------------------------------
1121−-- Serialization/Deserialization
1122−-------------------------------------------------------------------------------
1124−{-# INLINE pokeNewEnd #-}
1125−pokeNewEnd :: (MonadIO m, Unbox a) =>
1126− Int -> MutArray Word8 -> a -> m (MutArray Word8)
1127−pokeNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1128− assert (newEnd <= arrBound) (return ())
1129− liftIO $ pokeAt arrEnd arrContents x
1130− return $ arr {arrEnd = newEnd}
1132−-- | Really really unsafe, unboxes a Haskell type and appends the resulting
1133−-- bytes to the byte array, may cause silent data corruption or if you are
1134−-- lucky a segfault if the array does not have enough space to append the
1138−{-# INLINE pokeAppendUnsafe #-}
1139−pokeAppendUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1140− MutArray Word8 -> a -> m (MutArray Word8)
1141−pokeAppendUnsafe arr@MutArray{..} = pokeNewEnd (arrEnd + SIZE_OF(a)) arr
1143−-- | Skip the specified number of bytes in the array. The data in the skipped
1144−-- region remains uninitialzed.
1145−{-# INLINE pokeSkipUnsafe #-}
1146−pokeSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1147−pokeSkipUnsafe n arr@MutArray{..} = do
1148− let newEnd = arrEnd + n
1149− in assert (newEnd <= arrBound) (arr {arrEnd = newEnd})
1151−-- | Like 'pokeAppend' but does not grow the array when pre-allocated array
1152−-- capacity becomes full.
1155−{-# INLINE pokeAppendMay #-}
1156−pokeAppendMay :: forall m a. (MonadIO m, Unbox a) =>
1157− MutArray Word8 -> a -> m (Maybe (MutArray Word8))
1158−pokeAppendMay arr@MutArray{..} x = liftIO $ do
1159− let newEnd = arrEnd + SIZE_OF(a)
1160− if newEnd <= arrBound
1161− then Just <$> pokeNewEnd newEnd arr x
1162− else return Nothing
1164−{-# NOINLINE pokeWithRealloc #-}
1165−pokeWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1169− -> m (MutArray Word8)
1170−pokeWithRealloc sizer arr x = do
1171− arr1 <- liftIO $ reallocWith "pokeWithRealloc" sizer (SIZE_OF(a)) arr
1172− pokeAppendUnsafe arr1 x
1174−{-# INLINE pokeAppendWith #-}
1175−pokeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1179− -> m (MutArray Word8)
1180−pokeAppendWith allocSize arr x = liftIO $ do
1181− let newEnd = arrEnd arr + SIZE_OF(a)
1182− if newEnd <= arrBound arr
1183− then pokeNewEnd newEnd arr x
1184− else pokeWithRealloc allocSize arr x
1186−-- | Unbox a Haskell type and append the resulting bytes to a mutable byte
1187−-- array. The array is grown exponentially when more space is needed.
1191−-- >>> pokeAppend arr x = MutArray.castUnsafe <$> MutArray.snoc (MutArray.castUnsafe arr) x
1193−{-# INLINE pokeAppend #-}
1194−pokeAppend :: forall m a. (MonadIO m, Unbox a) =>
1195− MutArray Word8 -> a -> m (MutArray Word8)
1196−pokeAppend = pokeAppendWith f
1201− if isPower2 oldSize
1203− else roundUpToPower2 oldSize * 2
1205−-- | Really really unsafe, create a Haskell value from an unboxed byte array,
1206−-- does not check if the array is big enough, may return garbage or if you are
1207−-- lucky may cause a segfault.
1210−{-# INLINE peekUnconsUnsafe #-}
1211−peekUnconsUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1212− MutArray Word8 -> m (a, MutArray Word8)
1213−peekUnconsUnsafe MutArray{..} = do
1214− let start1 = arrStart + SIZE_OF(a)
1215− assert (start1 <= arrEnd) (return ())
1217− r <- peekAt arrStart arrContents
1218− return (r, MutArray arrContents start1 arrEnd arrBound)
1220−-- | Discard the specified number of bytes in the array.
1221−{-# INLINE peekSkipUnsafe #-}
1222−peekSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1223−peekSkipUnsafe n MutArray{..} =
1224− let start1 = arrStart + n
1225− in assert (start1 <= arrEnd) (MutArray arrContents start1 arrEnd arrBound)
1227−-- | Create a Haskell value from its unboxed representation from the head of a
1228−-- byte array, return the value and the remaining array.
1229−{-# INLINE peekUncons #-}
1230−peekUncons :: forall m a. (MonadIO m, Unbox a) =>
1231− MutArray Word8 -> m (Maybe a, MutArray Word8)
1232−peekUncons arr@MutArray{..} = do
1233− let start1 = arrStart + SIZE_OF(a)
1235− then return (Nothing, arr)
1237− r <- peekAt arrStart arrContents
1238− return (Just r, MutArray arrContents start1 arrEnd arrBound)
1240-------------------------------------------------------------------------------
1012-------------------------------------------------------------------------------
1241-- Random reads
1013-- Random reads
1242-------------------------------------------------------------------------------
1014-------------------------------------------------------------------------------
@@ -1279,10 +1051,15 @@ getIndexRev i MutArray{..} = do
1279data GetIndicesState contents start end st =
1051data GetIndicesState contents start end st =
1280 GetIndicesState contents start end st
1052 GetIndicesState contents start end st
1282−{-# INLINE indexReaderWith #-}
1054+-- | Given an unfold that generates array indices, read the elements on those
1055+-- indices from the supplied MutArray. An error is thrown if an index is out of
1059+{-# INLINE getIndicesD #-}
1283−indexReaderWith :: (Monad m, Unbox a) =>
1060+getIndicesD :: (Monad m, Unbox a) =>
1284 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1061 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1285−indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
1062+getIndicesD liftio (D.Stream stepi sti) = Unfold step inject
@@ -1301,26 +1078,9 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
1301 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
1078 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
1302 D.Stop -> return D.Stop
1079 D.Stop -> return D.Stop
1304−{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1305−{-# INLINE getIndicesWith #-}
1306−getIndicesWith :: (Monad m, Unbox a) =>
1307− (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1308−getIndicesWith = indexReaderWith
1310−-- | Given an unfold that generates array indices, read the elements on those
1311−-- indices from the supplied MutArray. An error is thrown if an index is out of
1315−{-# INLINE indexReader #-}
1316−indexReader :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1317−indexReader = indexReaderWith liftIO
1319−-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1320−{-# DEPRECATED getIndices "Please use indexReader instead." #-}
1321{-# INLINE getIndices #-}
1081{-# INLINE getIndices #-}
1322getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1082getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1323−getIndices = indexReader
1083+getIndices = getIndicesD liftIO
1325-------------------------------------------------------------------------------
1085-------------------------------------------------------------------------------
1326-- Subarrays
1086-- Subarrays
@@ -1615,7 +1375,7 @@ chunksOfAs ps n (D.Stream step state) =
1616-- Same as the following but may be more efficient:
1376-- Same as the following but may be more efficient:
1618−-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
1378+-- >>> chunksOf n = Stream.foldMany (MutArray.writeN n)
1620-- /Pre-release/
1380-- /Pre-release/
1621{-# INLINE_NORMAL chunksOf #-}
1381{-# INLINE_NORMAL chunksOf #-}
@@ -1624,14 +1384,14 @@ chunksOf :: forall m a. (MonadIO m, Unbox a)
1624-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1384-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1625-- benchmark. It seems it has difficulty producing optimized code when
1385-- benchmark. It seems it has difficulty producing optimized code when
1626-- converting to StreamK. Investigate GHC optimizations.
1386-- converting to StreamK. Investigate GHC optimizations.
1627−-- chunksOf n = D.foldMany (createOf n)
1387+-- chunksOf n = D.foldMany (writeN n)
1628chunksOf = chunksOfAs Unpinned
1388chunksOf = chunksOfAs Unpinned
1630-- | Like 'chunksOf' but creates pinned arrays.
1390-- | Like 'chunksOf' but creates pinned arrays.
1631{-# INLINE_NORMAL pinnedChunksOf #-}
1391{-# INLINE_NORMAL pinnedChunksOf #-}
1632pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1392pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1633 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1393 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1634−-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
1394+-- pinnedChunksOf n = D.foldMany (pinnedWriteN n)
1635pinnedChunksOf = chunksOfAs Pinned
1395pinnedChunksOf = chunksOfAs Pinned
1637-- | When we are buffering a stream of unknown size into an array we do not
1397-- | When we are buffering a stream of unknown size into an array we do not
@@ -1664,10 +1424,16 @@ data FlattenState s contents a =
1664 OuterLoop s
1424 OuterLoop s
1665 | InnerLoop s contents !Int !Int
1425 | InnerLoop s contents !Int !Int
1427+-- | Use the "reader" unfold instead.
1429+-- @concatChunks = unfoldMany reader@
1431+-- We can try this if there are any fusion issues in the unfold.
1667−{-# INLINE_NORMAL concatWith #-}
1433+{-# INLINE_NORMAL concatChunks #-}
1668−concatWith :: forall m a. (Monad m, Unbox a)
1434+concatChunks :: forall m a. (MonadIO m, Unbox a)
1669− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1435+ => D.Stream m (MutArray a) -> D.Stream m a
1670−concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1436+concatChunks (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1684,30 +1450,24 @@ concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1684 return $ D.Skip $ OuterLoop st
1450 return $ D.Skip $ OuterLoop st
1686 step' _ (InnerLoop st contents p end) = do
1452 step' _ (InnerLoop st contents p end) = do
1687− x <- liftio $ peekAt p contents
1453+ x <- liftIO $ peekAt p contents
1688 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1454 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1456+{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1457+flattenArrays :: forall m a. (MonadIO m, Unbox a)
1458+ => D.Stream m (MutArray a) -> D.Stream m a
1459+flattenArrays = concatChunks
1690−-- | Use the "reader" unfold instead.
1461+-- | Use the "readerRev" unfold instead.
1692−-- @concat = unfoldMany reader@
1463+-- @concatChunks = unfoldMany readerRev@
1694-- We can try this if there are any fusion issues in the unfold.
1465-- We can try this if there are any fusion issues in the unfold.
1696−{-# INLINE_NORMAL concat #-}
1467+{-# INLINE_NORMAL concatChunksRev #-}
1697−concat :: forall m a. (MonadIO m, Unbox a)
1468+concatChunksRev :: forall m a. (MonadIO m, Unbox a)
1698 => D.Stream m (MutArray a) -> D.Stream m a
1469 => D.Stream m (MutArray a) -> D.Stream m a
1699−concat = concatWith liftIO
1701−{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1702−{-# INLINE flattenArrays #-}
1703−flattenArrays :: forall m a. (MonadIO m, Unbox a)
1704− => D.Stream m (MutArray a) -> D.Stream m a
1705−flattenArrays = concat
1707−{-# INLINE_NORMAL concatRevWith #-}
1708−concatRevWith :: forall m a. (Monad m, Unbox a)
1709− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1710−concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1470+concatChunksRev (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1725,26 +1485,14 @@ concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1725 return $ D.Skip $ OuterLoop st
1485 return $ D.Skip $ OuterLoop st
1727 step' _ (InnerLoop st contents p start) = do
1487 step' _ (InnerLoop st contents p start) = do
1728− x <- liftio $ peekAt p contents
1488+ x <- liftIO $ peekAt p contents
1729 let cur = INDEX_PREV(p,a)
1489 let cur = INDEX_PREV(p,a)
1730 return $ D.Yield x (InnerLoop st contents cur start)
1490 return $ D.Yield x (InnerLoop st contents cur start)
1732−-- | Use the "readerRev" unfold instead.
1734−-- @concat = unfoldMany readerRev@
1736−-- We can try this if there are any fusion issues in the unfold.
1738−{-# INLINE_NORMAL concatRev #-}
1739−concatRev :: forall m a. (MonadIO m, Unbox a)
1740− => D.Stream m (MutArray a) -> D.Stream m a
1741−concatRev = concatRevWith liftIO
1743{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1492{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1744−{-# INLINE flattenArraysRev #-}
1745flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1493flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1746 => D.Stream m (MutArray a) -> D.Stream m a
1494 => D.Stream m (MutArray a) -> D.Stream m a
1747−flattenArraysRev = concatRev
1495+flattenArraysRev = concatChunksRev
1749-------------------------------------------------------------------------------
1497-------------------------------------------------------------------------------
1750-- Unfolds
1498-- Unfolds
@@ -1863,11 +1611,11 @@ toList MutArray{..} = liftIO $ go arrStart
1863 x <- peekAt p arrContents
1611 x <- peekAt p arrContents
1864 (:) x <$> go (INDEX_NEXT(p,a))
1612 (:) x <$> go (INDEX_NEXT(p,a))
1866−{-# INLINE_NORMAL toStreamWith #-}
1614+{-# INLINE_NORMAL toStreamDWith #-}
1867−toStreamWith ::
1615+toStreamDWith ::
1868 forall m a. (Monad m, Unbox a)
1616 forall m a. (Monad m, Unbox a)
1869 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1617 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1870−toStreamWith liftio MutArray{..} = D.Stream step arrStart
1618+toStreamDWith liftio MutArray{..} = D.Stream step arrStart
@@ -1883,7 +1631,7 @@ toStreamWith liftio MutArray{..} = D.Stream step arrStart
1884{-# INLINE_NORMAL read #-}
1632{-# INLINE_NORMAL read #-}
1885read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1633read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1886−read = toStreamWith liftIO
1634+read = toStreamDWith liftIO
1888{-# INLINE toStreamKWith #-}
1636{-# INLINE toStreamKWith #-}
1889toStreamKWith ::
1637toStreamKWith ::
@@ -1902,11 +1650,11 @@ toStreamKWith liftio MutArray{..} = go arrStart
1902toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1650toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1903toStreamK = toStreamKWith liftIO
1651toStreamK = toStreamKWith liftIO
1905−{-# INLINE_NORMAL toStreamRevWith #-}
1653+{-# INLINE_NORMAL toStreamDRevWith #-}
1906−toStreamRevWith ::
1654+toStreamDRevWith ::
1907 forall m a. (Monad m, Unbox a)
1655 forall m a. (Monad m, Unbox a)
1908 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1656 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1909−toStreamRevWith liftio MutArray{..} =
1657+toStreamDRevWith liftio MutArray{..} =
1910 let p = INDEX_PREV(arrEnd,a)
1658 let p = INDEX_PREV(arrEnd,a)
1911 in D.Stream step p
1659 in D.Stream step p
@@ -1924,7 +1672,7 @@ toStreamRevWith liftio MutArray{..} =
1925{-# INLINE_NORMAL readRev #-}
1673{-# INLINE_NORMAL readRev #-}
1926readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1674readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1927−readRev = toStreamRevWith liftIO
1675+readRev = toStreamDRevWith liftIO
1929{-# INLINE toStreamKRevWith #-}
1677{-# INLINE toStreamKRevWith #-}
1930toStreamKRevWith ::
1678toStreamKRevWith ::
@@ -1973,7 +1721,7 @@ foldr f z arr = D.foldr f z $ read arr
1974-- XXX Keep the bound intact to not lose any free space? Perf impact?
1722-- XXX Keep the bound intact to not lose any free space? Perf impact?
1976−-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
1724+-- | @writeAppendNUnsafe n arr@ appends up to @n@ input items to the supplied
1977-- array.
1725-- array.
1979-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
1727-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1982,12 +1730,13 @@ foldr f z arr = D.foldr f z $ read arr
1982-- Any free space left in the array after appending @n@ elements is lost.
1730-- Any free space left in the array after appending @n@ elements is lost.
1984-- /Internal/
1732-- /Internal/
1985−{-# INLINE_NORMAL unsafeAppendN #-}
1733+{-# INLINE_NORMAL writeAppendNUnsafe #-}
1986−unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1734+writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1988 -> m (MutArray a)
1736 -> m (MutArray a)
1989 -> Fold m a (MutArray a)
1737 -> Fold m a (MutArray a)
1738+writeAppendNUnsafe n action =
1990−unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
1739+ fmap fromArrayUnsafe $ FL.foldlM' step initial
@@ -2000,7 +1749,7 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
2000 -- otherwise we lose that space.
1749 -- otherwise we lose that space.
2002 if free < needed
1751 if free < needed
2003− then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
1752+ then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
2004 else return arr
1753 else return arr
2005 return $ toArrayUnsafe arr1
1754 return $ toArrayUnsafe arr1
@@ -2008,51 +1757,30 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
2008 liftIO $ pokeAt end contents x
1757 liftIO $ pokeAt end contents x
2009 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
1758 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2011−{-# DEPRECATED writeAppendNUnsafe "Please use unsafeAppendN instead." #-}
2012−{-# INLINE writeAppendNUnsafe #-}
2013−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
2016− -> Fold m a (MutArray a)
2017−writeAppendNUnsafe = unsafeAppendN
2019-- | Append @n@ elements to an existing array. Any free space left in the array
1760-- | Append @n@ elements to an existing array. Any free space left in the array
2020-- after appending @n@ elements is lost.
1761-- after appending @n@ elements is lost.
2022−-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
1763+-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
2024−{-# INLINE_NORMAL appendN #-}
1765+{-# INLINE_NORMAL writeAppendN #-}
2025−appendN :: forall m a. (MonadIO m, Unbox a) =>
2026− Int -> m (MutArray a) -> Fold m a (MutArray a)
2027−appendN n initial = FL.take n (unsafeAppendN n initial)
2029−-- XXX Deprecate in major
2030−-- {-# DEPRECATED writeAppendN "Please use appendN instead." #-}
2031−{-# INLINE writeAppendN #-}
2032writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1766writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
2033 Int -> m (MutArray a) -> Fold m a (MutArray a)
1767 Int -> m (MutArray a) -> Fold m a (MutArray a)
2034−writeAppendN = appendN
1768+writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
2036−-- | @appendWith realloc action@ mutates the array generated by @action@ to
1770+-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
2037-- append the input stream. If there is no reserved space available in the
1771-- append the input stream. If there is no reserved space available in the
2038-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
1772-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
2039-- where @oldSize@ is the current size of the array in bytes.
1773-- where @oldSize@ is the current size of the array in bytes.
2041-- Note that the returned array may be a mutated version of original array.
1775-- Note that the returned array may be a mutated version of original array.
2043−-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
1777+-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
2045-- /Pre-release/
1779-- /Pre-release/
2046−{-# INLINE appendWith #-}
2047−appendWith :: forall m a. (MonadIO m, Unbox a) =>
2048− (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2049−appendWith sizer = FL.foldlM' (snocWith sizer)
2051−{-# DEPRECATED writeAppendWith "Please use appendWith instead." #-}
2052{-# INLINE writeAppendWith #-}
1780{-# INLINE writeAppendWith #-}
2053writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1781writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
2054 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
1782 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2055−writeAppendWith = appendWith
1783+writeAppendWith sizer = FL.foldlM' (snocWith sizer)
2057-- | @append action@ mutates the array generated by @action@ to append the
1785-- | @append action@ mutates the array generated by @action@ to append the
2058-- input stream. If there is no reserved space available in the array it is
1786-- input stream. If there is no reserved space available in the array it is
@@ -2060,33 +1788,26 @@ writeAppendWith = appendWith
2061-- Note that the returned array may be a mutated version of original array.
1789-- Note that the returned array may be a mutated version of original array.
2063−-- >>> append = MutArray.appendWith (* 2)
1791+-- >>> writeAppend = MutArray.writeAppendWith (* 2)
2065−{-# INLINE append #-}
2066−append :: forall m a. (MonadIO m, Unbox a) =>
2067− m (MutArray a) -> Fold m a (MutArray a)
2068−append = appendWith (* 2)
2070−-- XXX Deprecate in major
2071−-- {-# DEPRECATED writeAppend "Please use append instead." #-}
2072{-# INLINE writeAppend #-}
1793{-# INLINE writeAppend #-}
2073writeAppend :: forall m a. (MonadIO m, Unbox a) =>
1794writeAppend :: forall m a. (MonadIO m, Unbox a) =>
2074 m (MutArray a) -> Fold m a (MutArray a)
1795 m (MutArray a) -> Fold m a (MutArray a)
2075−writeAppend = append
1796+writeAppend = writeAppendWith (* 2)
2077-- XXX We can carry bound as well in the state to make sure we do not lose the
1798-- XXX We can carry bound as well in the state to make sure we do not lose the
2078-- remaining capacity. Need to check perf impact.
1799-- remaining capacity. Need to check perf impact.
2080−-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
1801+-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
2081−-- function as argument.
1802+-- as argument.
2083−-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
1804+-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
2085-- /Pre-release/
1806-- /Pre-release/
2086−{-# INLINE_NORMAL unsafeCreateOfWith #-}
1807+{-# INLINE_NORMAL writeNWithUnsafe #-}
2087−unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
1808+writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2088 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1809 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2089−unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
1810+writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
@@ -2097,64 +1818,40 @@ unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2098 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
1819 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2100−{-# DEPRECATED writeNWithUnsafe "Please use unsafeCreateOfWith instead." #-}
2101−{-# INLINE writeNWithUnsafe #-}
2102−writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2103− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2104−writeNWithUnsafe = unsafeCreateOfWith
2106{-# INLINE_NORMAL writeNUnsafeAs #-}
1821{-# INLINE_NORMAL writeNUnsafeAs #-}
2107writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
1822writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
2108 => PinnedState -> Int -> Fold m a (MutArray a)
1823 => PinnedState -> Int -> Fold m a (MutArray a)
2109−writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
1824+writeNUnsafeAs ps = writeNWithUnsafe (newAs ps)
2111−-- | Like 'createOf' but does not check the array bounds when writing. The fold
1826+-- | Like 'writeN' but does not check the array bounds when writing. The fold
2112-- driver must not call the step function more than 'n' times otherwise it will
1827-- driver must not call the step function more than 'n' times otherwise it will
2113-- corrupt the memory and crash. This function exists mainly because any
1828-- corrupt the memory and crash. This function exists mainly because any
2114-- conditional in the step function blocks fusion causing 10x performance
1829-- conditional in the step function blocks fusion causing 10x performance
2115-- slowdown.
1830-- slowdown.
2117−-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
1832+-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.new
2119−{-# INLINE_NORMAL unsafeCreateOf #-}
2120−unsafeCreateOf :: forall m a. (MonadIO m, Unbox a)
2121− => Int -> Fold m a (MutArray a)
2122−unsafeCreateOf = writeNUnsafeAs Unpinned
2124−{-# DEPRECATED writeNUnsafe "Please use unsafeCreateOf instead." #-}
2125−{-# INLINE writeNUnsafe #-}
1834+{-# INLINE_NORMAL writeNUnsafe #-}
2126writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
1835writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
2127 => Int -> Fold m a (MutArray a)
1836 => Int -> Fold m a (MutArray a)
2128−writeNUnsafe = unsafeCreateOf
1837+writeNUnsafe = writeNUnsafeAs Unpinned
2130−-- | Like 'unsafeCreateOf' but creates a pinned array.
2131−{-# INLINE_NORMAL unsafePinnedCreateOf #-}
2132−unsafePinnedCreateOf :: forall m a. (MonadIO m, Unbox a)
2133− => Int -> Fold m a (MutArray a)
2134−unsafePinnedCreateOf = writeNUnsafeAs Pinned
2136−{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
1839+-- | Like 'writeNUnsafe' but creates a pinned array.
2137−{-# INLINE pinnedWriteNUnsafe #-}
1840+{-# INLINE_NORMAL pinnedWriteNUnsafe #-}
2138pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
1841pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
2139 => Int -> Fold m a (MutArray a)
1842 => Int -> Fold m a (MutArray a)
2140−pinnedWriteNUnsafe = unsafePinnedCreateOf
1843+pinnedWriteNUnsafe = writeNUnsafeAs Pinned
2142−-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
1845+-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
2143-- allocated using the @alloc@ function.
1846-- allocated using the @alloc@ function.
2145−-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
1848+-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
2146−-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
1849+-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
2148−{-# INLINE_NORMAL createOfWith #-}
1851+{-# INLINE_NORMAL writeNWith #-}
2149−createOfWith :: forall m a. (MonadIO m, Unbox a)
2150− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2151−createOfWith alloc n = FL.take n (unsafeCreateOfWith alloc n)
2153−-- {-# DEPRECATED writeNWith "Please use createOfWith instead." #-}
2154−{-# INLINE writeNWith #-}
2155writeNWith :: forall m a. (MonadIO m, Unbox a)
1852writeNWith :: forall m a. (MonadIO m, Unbox a)
2156 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1853 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2157−writeNWith = createOfWith
1854+writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
2159{-# INLINE_NORMAL writeNAs #-}
1856{-# INLINE_NORMAL writeNAs #-}
2160writeNAs ::
1857writeNAs ::
@@ -2162,42 +1859,28 @@ writeNAs ::
2162 => PinnedState
1859 => PinnedState
2164 -> Fold m a (MutArray a)
1861 -> Fold m a (MutArray a)
2165−writeNAs ps = createOfWith (newAs ps)
1862+writeNAs ps = writeNWith (newAs ps)
2167−-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
1864+-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
2168-- 'MutArray'.
1865-- 'MutArray'.
2170−-- >>> createOf = MutArray.createOfWith MutArray.new
1867+-- >>> writeN = MutArray.writeNWith MutArray.new
2171−-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
1868+-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
2172−-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
1869+-- >>> writeN n = MutArray.writeAppendN n (MutArray.new n)
2174−{-# INLINE_NORMAL createOf #-}
1871+{-# INLINE_NORMAL writeN #-}
2175−createOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2176−createOf = writeNAs Unpinned
2178−-- XXX Deprecate in major
2179−-- {-# DEPRECATED writeN "Please use createOf instead." #-}
2180−{-# INLINE writeN #-}
2181writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1872writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2182−writeN = createOf
1873+writeN = writeNAs Unpinned
2184−-- | Like 'createOf' but creates a pinned array.
1875+-- | Like 'writeN' but creates a pinned array.
2185−{-# INLINE_NORMAL pinnedCreateOf #-}
2187− forall m a. (MonadIO m, Unbox a)
2189− -> Fold m a (MutArray a)
2190−pinnedCreateOf = writeNAs Pinned
2192−{-# DEPRECATED pinnedWriteN "Please use pinnedCreateOf instead." #-}
2193−{-# INLINE pinnedWriteN #-}
1876+{-# INLINE_NORMAL pinnedWriteN #-}
2194pinnedWriteN ::
1877pinnedWriteN ::
2195 forall m a. (MonadIO m, Unbox a)
1878 forall m a. (MonadIO m, Unbox a)
2197 -> Fold m a (MutArray a)
1880 -> Fold m a (MutArray a)
2198−pinnedWriteN = pinnedCreateOf
1881+pinnedWriteN = writeNAs Pinned
2200−-- | Like unsafeCreateOfWith but writes the array in reverse order.
1883+-- | Like writeNWithUnsafe but writes the array in reverse order.
2202-- /Internal/
1885-- /Internal/
2203{-# INLINE_NORMAL writeRevNWithUnsafe #-}
1886{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -2218,7 +1901,7 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2219 $ ArrayUnsafe contents ptr end
1902 $ ArrayUnsafe contents ptr end
2221−-- | Like createOfWith but writes the array in reverse order.
1904+-- | Like writeNWith but writes the array in reverse order.
2223-- /Internal/
1906-- /Internal/
2224{-# INLINE_NORMAL writeRevNWith #-}
1907{-# INLINE_NORMAL writeRevNWith #-}
@@ -2226,36 +1909,31 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
2226 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1909 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2227writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
1910writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
2229−-- | Like 'createOf' but writes the array in reverse order.
1912+-- | Like writeN but writes the array in reverse order.
2231-- /Pre-release/
1914-- /Pre-release/
2232−{-# INLINE_NORMAL revCreateOf #-}
1915+{-# INLINE_NORMAL writeRevN #-}
2233−revCreateOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2234−revCreateOf = writeRevNWith new
2236−{-# DEPRECATED writeRevN "Please use revCreateOf instead." #-}
2237−{-# INLINE writeRevN #-}
2238writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1916writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2239−writeRevN = revCreateOf
1917+writeRevN = writeRevNWith new
2241-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
1919-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
2242-- input stream to a 'MutArray' aligned to the given size.
1920-- input stream to a 'MutArray' aligned to the given size.
2244−-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
1922+-- >>> pinnedWriteNAligned align = MutArray.writeNWith (MutArray.pinnedNewAligned align)
2245−-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
1923+-- >>> pinnedWriteNAligned align n = MutArray.writeAppendN n (MutArray.pinnedNewAligned align n)
2247-- /Pre-release/
1925-- /Pre-release/
2249{-# INLINE_NORMAL pinnedWriteNAligned #-}
1927{-# INLINE_NORMAL pinnedWriteNAligned #-}
2250pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
1928pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
2251 => Int -> Int -> Fold m a (MutArray a)
1929 => Int -> Int -> Fold m a (MutArray a)
2252−pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
1930+pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
2254-- XXX Buffer to a list instead?
1932-- XXX Buffer to a list instead?
2256-- | Buffer a stream into a stream of arrays.
1934-- | Buffer a stream into a stream of arrays.
2258−-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
1936+-- >>> buildChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
2260-- Breaking an array into an array stream can be useful to consume a large
1938-- Breaking an array into an array stream can be useful to consume a large
2261-- array sequentially such that memory of the array is released incrementatlly.
1939-- array sequentially such that memory of the array is released incrementatlly.
@@ -2267,10 +1945,9 @@ pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
2267{-# INLINE_NORMAL buildChunks #-}
1945{-# INLINE_NORMAL buildChunks #-}
2268buildChunks :: (MonadIO m, Unbox a) =>
1946buildChunks :: (MonadIO m, Unbox a) =>
2269 Int -> Fold m a (StreamK n (MutArray a))
1947 Int -> Fold m a (StreamK n (MutArray a))
2270−buildChunks n = FL.many (createOf n) FL.toStreamK
1948+buildChunks n = FL.many (writeN n) FL.toStreamK
2272{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
1950{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273−{-# INLINE writeChunks #-}
2274writeChunks :: (MonadIO m, Unbox a) =>
1951writeChunks :: (MonadIO m, Unbox a) =>
2275 Int -> Fold m a (StreamK n (MutArray a))
1952 Int -> Fold m a (StreamK n (MutArray a))
2276writeChunks = buildChunks
1953writeChunks = buildChunks
@@ -2278,29 +1955,29 @@ writeChunks = buildChunks
2278{-# INLINE_NORMAL writeWithAs #-}
1955{-# INLINE_NORMAL writeWithAs #-}
2279writeWithAs :: forall m a. (MonadIO m, Unbox a)
1956writeWithAs :: forall m a. (MonadIO m, Unbox a)
2280 => PinnedState -> Int -> Fold m a (MutArray a)
1957 => PinnedState -> Int -> Fold m a (MutArray a)
2281−-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
1958+-- writeWithAs ps n = FL.rmapM rightSize $ writeAppendWith (* 2) (newAs ps n)
2282writeWithAs ps elemCount =
1959writeWithAs ps elemCount =
2283 FL.rmapM extract $ FL.foldlM' step initial
1960 FL.rmapM extract $ FL.foldlM' step initial
2287 initial = do
1964 initial = do
2288− when (elemCount < 0) $ error "createWith: elemCount is negative"
1965+ when (elemCount < 0) $ error "writeWith: elemCount is negative"
2289− newAs ps elemCount
1966+ liftIO $ newAs ps elemCount
2291 step arr@(MutArray _ start end bound) x
1968 step arr@(MutArray _ start end bound) x
2292 | INDEX_NEXT(end,a) > bound = do
1969 | INDEX_NEXT(end,a) > bound = do
2293 let oldSize = end - start
1970 let oldSize = end - start
2294 newSize = max (oldSize * 2) 1
1971 newSize = max (oldSize * 2) 1
2295− arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
1972+ arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
2296 snocUnsafe arr1 x
1973 snocUnsafe arr1 x
2297 step arr x = snocUnsafe arr x
1974 step arr x = snocUnsafe arr x
2299 extract = liftIO . rightSize
1976 extract = liftIO . rightSize
2301−-- XXX Compare createWith with fromStreamD which uses an array of streams
1978+-- XXX Compare writeWith with fromStreamD which uses an array of streams
2302-- implementation. We can write this using buildChunks above if that is faster.
1979-- implementation. We can write this using buildChunks above if that is faster.
2303−-- If createWith is faster then we should use that to implement
1980+-- If writeWith is faster then we should use that to implement
2304-- fromStreamD.
1981-- fromStreamD.
2306-- XXX The realloc based implementation needs to make one extra copy if we use
1983-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2315,56 +1992,39 @@ writeWithAs ps elemCount =
2315-- XXX check if GHC's memory allocator is efficient enough. We can try the C
1992-- XXX check if GHC's memory allocator is efficient enough. We can try the C
2316-- malloc to compare against.
1993-- malloc to compare against.
2318−-- | @createWith minCount@ folds the whole input to a single array. The array
1995+-- | @writeWith minCount@ folds the whole input to a single array. The array
2319-- starts at a size big enough to hold minCount elements, the size is doubled
1996-- starts at a size big enough to hold minCount elements, the size is doubled
2320-- every time the array needs to be grown.
1997-- every time the array needs to be grown.
2322-- /Caution! Do not use this on infinite streams./
1999-- /Caution! Do not use this on infinite streams./
2324−-- >>> f n = MutArray.appendWith (* 2) (MutArray.emptyOf n)
2001+-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.new n)
2325−-- >>> createWith n = Fold.rmapM MutArray.rightSize (f n)
2002+-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
2326−-- >>> createWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
2003+-- >>> writeWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
2328-- /Pre-release/
2005-- /Pre-release/
2329−{-# INLINE_NORMAL createWith #-}
2006+{-# INLINE_NORMAL writeWith #-}
2330−createWith :: forall m a. (MonadIO m, Unbox a)
2331− => Int -> Fold m a (MutArray a)
2332−-- createWith n = FL.rmapM rightSize $ appendWith (* 2) (emptyOf n)
2333−createWith = writeWithAs Unpinned
2335−{-# DEPRECATED writeWith "Please use createWith instead." #-}
2336−{-# INLINE writeWith #-}
2337writeWith :: forall m a. (MonadIO m, Unbox a)
2007writeWith :: forall m a. (MonadIO m, Unbox a)
2338 => Int -> Fold m a (MutArray a)
2008 => Int -> Fold m a (MutArray a)
2339−writeWith = createWith
2009+-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (new n)
2010+writeWith = writeWithAs Unpinned
2341-- | Fold the whole input to a single array.
2012-- | Fold the whole input to a single array.
2343−-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
2014+-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
2344-- rounded up to the element size.
2015-- rounded up to the element size.
2346-- /Caution! Do not use this on infinite streams./
2017-- /Caution! Do not use this on infinite streams./
2348−{-# INLINE create #-}
2349−create :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2350−create = createWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2352−-- XXX Deprecate in major
2353−-- {-# DEPRECATED write "Please use create instead." #-}
2354{-# INLINE write #-}
2019{-# INLINE write #-}
2355write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2020write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2356−write = create
2021+write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2358−-- | Like 'create' but creates a pinned array.
2023+-- | Like 'write' but creates a pinned array.
2359−{-# INLINE pinnedCreate #-}
2360−pinnedCreate :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2362− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2364−{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
2365{-# INLINE pinnedWrite #-}
2024{-# INLINE pinnedWrite #-}
2366pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2025pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2367−pinnedWrite = pinnedCreate
2026+pinnedWrite =
2027+ writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2369-------------------------------------------------------------------------------
2029-------------------------------------------------------------------------------
2370-- construct from streams, known size
2030-- construct from streams, known size
@@ -2374,7 +2034,7 @@ pinnedWrite = pinnedCreate
2374fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
2034fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
2375 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
2035 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
2376fromStreamDNAs ps limit str = do
2036fromStreamDNAs ps limit str = do
2377− (arr :: MutArray a) <- newAs ps limit
2037+ (arr :: MutArray a) <- liftIO $ newAs ps limit
2378 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
2038 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
2379 return $ arr {arrEnd = end}
2039 return $ arr {arrEnd = end}
@@ -2384,18 +2044,17 @@ fromStreamDNAs ps limit str = do
2384 liftIO $ pokeAt ptr arrContents x
2044 liftIO $ pokeAt ptr arrContents x
2385 return $ INDEX_NEXT(ptr,a)
2045 return $ INDEX_NEXT(ptr,a)
2387−-- | Use the 'createOf' fold instead.
2047+-- | Use the 'writeN' fold instead.
2389−-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
2049+-- >>> fromStreamN n = Stream.fold (MutArray.writeN n)
2391{-# INLINE_NORMAL fromStreamN #-}
2051{-# INLINE_NORMAL fromStreamN #-}
2392fromStreamN :: forall m a. (MonadIO m, Unbox a)
2052fromStreamN :: forall m a. (MonadIO m, Unbox a)
2393 => Int -> D.Stream m a -> m (MutArray a)
2053 => Int -> D.Stream m a -> m (MutArray a)
2394−-- fromStreamDN n = D.fold (createOf n)
2054+-- fromStreamDN n = D.fold (writeN n)
2395fromStreamN = fromStreamDNAs Unpinned
2055fromStreamN = fromStreamDNAs Unpinned
2397{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2057{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398−{-# INLINE fromStreamDN #-}
2399fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2058fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2400 => Int -> D.Stream m a -> m (MutArray a)
2059 => Int -> D.Stream m a -> m (MutArray a)
2401fromStreamDN = fromStreamN
2060fromStreamDN = fromStreamN
@@ -2418,20 +2077,20 @@ pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
2418-- /Pre-release/
2077-- /Pre-release/
2419{-# INLINE fromListRevN #-}
2078{-# INLINE fromListRevN #-}
2420fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2079fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2421−fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
2080+fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
2423-- | Convert a pure stream in Identity monad to a mutable array.
2082-- | Convert a pure stream in Identity monad to a mutable array.
2424{-# INLINABLE fromPureStreamN #-}
2083{-# INLINABLE fromPureStreamN #-}
2425fromPureStreamN :: (MonadIO m, Unbox a) =>
2084fromPureStreamN :: (MonadIO m, Unbox a) =>
2426 Int -> Stream Identity a -> m (MutArray a)
2085 Int -> Stream Identity a -> m (MutArray a)
2427fromPureStreamN n xs =
2086fromPureStreamN n xs =
2428− D.fold (createOf n) $ D.morphInner (return . runIdentity) xs
2087+ liftIO $ D.fold (writeN n) $ D.morphInner (return . runIdentity) xs
2430-- | Convert a pure stream in Identity monad to a mutable array.
2089-- | Convert a pure stream in Identity monad to a mutable array.
2431{-# INLINABLE fromPureStream #-}
2090{-# INLINABLE fromPureStream #-}
2432fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2091fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2433fromPureStream xs =
2092fromPureStream xs =
2434− D.fold create $ D.morphInner (return . runIdentity) xs
2093+ liftIO $ D.fold write $ D.morphInner (return . runIdentity) xs
2436{-# INLINABLE fromPtrN #-}
2095{-# INLINABLE fromPtrN #-}
2437fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
2096fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
@@ -2440,7 +2099,7 @@ fromPtrN len addr = do
2440 -- XXX We can implement a stream copy in a similar way by streaming Word64
2099 -- XXX We can implement a stream copy in a similar way by streaming Word64
2441 -- first and then remaining Word8.
2100 -- first and then remaining Word8.
2442 arr <- new len
2101 arr <- new len
2443− _ <- unsafeAsPtr arr
2102+ _ <- asUnpinnedPtrUnsafe arr
2444 (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2103 (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2445 return (arr {arrEnd = len})
2104 return (arr {arrEnd = len})
@@ -2456,7 +2115,7 @@ fromByteStr# addr = do
2456 len <- liftIO $ c_strlen (Ptr addr)
2115 len <- liftIO $ c_strlen (Ptr addr)
2457 let lenInt = fromIntegral len
2116 let lenInt = fromIntegral len
2458 arr <- new lenInt
2117 arr <- new lenInt
2459− _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2118+ _ <- asUnpinnedPtrUnsafe arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2460 return (arr {arrEnd = lenInt})
2119 return (arr {arrEnd = lenInt})
2462-------------------------------------------------------------------------------
2121-------------------------------------------------------------------------------
@@ -2477,7 +2136,7 @@ fromChunksRealloced s = do
2477 arr <- D.foldlM' spliceExp (pure a) strm
2136 arr <- D.foldlM' spliceExp (pure a) strm
2478 -- Reallocation is exponential so there may be 50% empty space in
2137 -- Reallocation is exponential so there may be 50% empty space in
2479 -- worst case. One more reallocation to reclaim the space.
2138 -- worst case. One more reallocation to reclaim the space.
2480− rightSize arr
2139+ liftIO $ rightSize arr
2481 Nothing -> pure nil
2140 Nothing -> pure nil
2483-------------------------------------------------------------------------------
2142-------------------------------------------------------------------------------
@@ -2515,7 +2174,6 @@ fromChunksK :: (Unbox a, MonadIO m) =>
2515fromChunksK = fromChunkskAs Unpinned
2174fromChunksK = fromChunkskAs Unpinned
2517{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2176{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2518−{-# INLINE fromArrayStreamK #-}
2519fromArrayStreamK :: (Unbox a, MonadIO m) =>
2177fromArrayStreamK :: (Unbox a, MonadIO m) =>
2520 StreamK m (MutArray a) -> m (MutArray a)
2178 StreamK m (MutArray a) -> m (MutArray a)
2521fromArrayStreamK = fromChunksK
2179fromArrayStreamK = fromChunksK
@@ -2527,7 +2185,7 @@ fromStreamDAs ps m =
2527 arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2185 arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2529-- | Create an 'Array' from a stream. This is useful when we want to create a
2187-- | Create an 'Array' from a stream. This is useful when we want to create a
2530−-- single array from a stream of unknown size. 'createOf' is at least twice
2188+-- single array from a stream of unknown size. 'writeN' is at least twice
2531-- as efficient when the size is already known.
2189-- as efficient when the size is already known.
2533-- Note that if the input stream is too large memory allocation for the array
2191-- Note that if the input stream is too large memory allocation for the array
@@ -2539,19 +2197,19 @@ fromStreamDAs ps m =
2539fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2197fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2540fromStream = fromStreamDAs Unpinned
2198fromStream = fromStreamDAs Unpinned
2542−-- fromStream (Stream m) = P.fold create m
2200+-- fromStream (Stream m) = P.fold write m
2543-- CAUTION: a very large number (millions) of arrays can degrade performance
2201-- CAUTION: a very large number (millions) of arrays can degrade performance
2544-- due to GC overhead because we need to buffer the arrays before we flatten
2202-- due to GC overhead because we need to buffer the arrays before we flatten
2545-- all the arrays.
2203-- all the arrays.
2547−-- XXX Compare if this is faster or "fold create".
2205+-- XXX Compare if this is faster or "fold write".
2549-- | We could take the approach of doubling the memory allocation on each
2207-- | We could take the approach of doubling the memory allocation on each
2550-- overflow. This would result in more or less the same amount of copying as in
2208-- overflow. This would result in more or less the same amount of copying as in
2551-- the chunking approach. However, if we have to shrink in the end then it may
2209-- the chunking approach. However, if we have to shrink in the end then it may
2552-- result in an extra copy of the entire data.
2210-- result in an extra copy of the entire data.
2554−-- >>> fromStreamD = StreamD.fold MutArray.create
2212+-- >>> fromStreamD = StreamD.fold MutArray.write
2556{-# INLINE fromStreamD #-}
2214{-# INLINE fromStreamD #-}
2557{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
2215{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
@@ -2581,10 +2239,6 @@ fromListRev xs = fromListRevN (Prelude.length xs) xs
2581-- Cloning
2239-- Cloning
2582-------------------------------------------------------------------------------
2240-------------------------------------------------------------------------------
2584−-- Arrays are aligned on 64-bit boundaries. The fastest way to copy an array is
2585−-- to unsafeCast it to Word64, read it, write it to Word64 array and unsafeCast
2586−-- it again. We can use SIMD read/write as well.
2588{-# INLINE cloneAs #-}
2242{-# INLINE cloneAs #-}
2589cloneAs ::
2243cloneAs ::
2590 ( MonadIO m
2244 ( MonadIO m
@@ -2594,7 +2248,7 @@ cloneAs ::
2595 => PinnedState -> MutArray a -> m (MutArray a)
2249 => PinnedState -> MutArray a -> m (MutArray a)
2596cloneAs ps src =
2250cloneAs ps src =
2597− do
2251+ liftIO $ do
2598 let startSrc = arrStart src
2252 let startSrc = arrStart src
2599 srcLen = arrEnd src - startSrc
2253 srcLen = arrEnd src - startSrc
2600 newArrContents <-
2254 newArrContents <-
@@ -2633,16 +2287,17 @@ spliceCopy :: forall m a. MonadIO m =>
2633 Unbox a =>
2287 Unbox a =>
2635 MutArray a -> MutArray a -> m (MutArray a)
2289 MutArray a -> MutArray a -> m (MutArray a)
2636−spliceCopy arr1 arr2 = do
2290+spliceCopy arr1 arr2 = liftIO $ do
2637 let start1 = arrStart arr1
2291 let start1 = arrStart arr1
2638 start2 = arrStart arr2
2292 start2 = arrStart arr2
2639 len1 = arrEnd arr1 - start1
2293 len1 = arrEnd arr1 - start1
2640 len2 = arrEnd arr2 - start2
2294 len2 = arrEnd arr2 - start2
2641− let len = len1 + len2
2295+ let newLen = len1 + len2
2642 newArrContents <-
2296 newArrContents <-
2643 if Unboxed.isPinned (arrContents arr1)
2297 if Unboxed.isPinned (arrContents arr1)
2644− then liftIO $ Unboxed.pinnedNew len
2298+ then Unboxed.pinnedNew newLen
2645− else liftIO $ Unboxed.new len
2299+ else Unboxed.new newLen
2300+ let len = len1 + len2
2646 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
2301 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
2647 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
2302 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
2648 return $ MutArray newArrContents 0 len len
2303 return $ MutArray newArrContents 0 len len
@@ -2654,7 +2309,7 @@ spliceCopy arr1 arr2 = do
2654spliceUnsafe :: MonadIO m =>
2309spliceUnsafe :: MonadIO m =>
2655 MutArray a -> MutArray a -> m (MutArray a)
2310 MutArray a -> MutArray a -> m (MutArray a)
2656spliceUnsafe dst src =
2311spliceUnsafe dst src =
2657− do
2312+ liftIO $ do
2658 let startSrc = arrStart src
2313 let startSrc = arrStart src
2659 srcLen = arrEnd src - startSrc
2314 srcLen = arrEnd src - startSrc
2660 endDst = arrEnd dst
2315 endDst = arrEnd dst
@@ -2676,7 +2331,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
2676 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2331 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2677spliceWith sizer dst@(MutArray _ start end bound) src = do
2332spliceWith sizer dst@(MutArray _ start end bound) src = do
2679− let f = appendWith (`sizer` byteLength src) (return dst)
2334+ let f = writeAppendWith (`sizer` byteLength src) (return dst)
2680 in D.fold f (toStreamD src)
2335 in D.fold f (toStreamD src)
2682 assert (end <= bound) (return ())
2337 assert (end <= bound) (return ())
@@ -2692,7 +2347,7 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
2692 $ "splice: newSize is less than the total size "
2347 $ "splice: newSize is less than the total size "
2693 ++ "of arrays being appended. Please check the "
2348 ++ "of arrays being appended. Please check the "
2694 ++ "sizer function passed."
2349 ++ "sizer function passed."
2695− realloc newSizeInBytes dst
2350+ liftIO $ realloc newSizeInBytes dst
2696 else return dst
2351 else return dst
2697 spliceUnsafe dst1 src
2352 spliceUnsafe dst1 src
@@ -2729,22 +2384,11 @@ spliceExp = spliceWith (\l1 l2 -> max (l1 * 2) (l1 + l2))
2729-- Splitting
2384-- Splitting
2730-------------------------------------------------------------------------------
2385-------------------------------------------------------------------------------
2732−-- | Generate a stream of array slices using a predicate. The array element
2733−-- matching the predicate is dropped.
2736−{-# INLINE splitOn #-}
2737−splitOn :: (MonadIO m, Unbox a) =>
2738− (a -> Bool) -> MutArray a -> Stream m (MutArray a)
2739−splitOn predicate arr =
2740− fmap (\(i, len) -> getSliceUnsafe i len arr)
2741− $ D.indexOnSuffix predicate (read arr)
2743-- | Drops the separator byte
2387-- | Drops the separator byte
2744{-# INLINE breakOn #-}
2388{-# INLINE breakOn #-}
2745breakOn :: MonadIO m
2389breakOn :: MonadIO m
2746 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2390 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2747−breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2391+breakOn sep arr@MutArray{..} = asUnpinnedPtrUnsafe arr $ \p -> liftIO $ do
2748 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2392 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2749 -- Need efficient stream based primitives that work on Word64.
2393 -- Need efficient stream based primitives that work on Word64.
2750 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
2394 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
@@ -2767,41 +2411,32 @@ breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2770−-- | Like 'splitAt' but does not check whether the index is valid.
2772−{-# INLINE unsafeSplitAt #-}
2773−unsafeSplitAt :: forall a. Unbox a =>
2774− Int -> MutArray a -> (MutArray a, MutArray a)
2775−unsafeSplitAt i MutArray{..} =
2776− let off = i * SIZE_OF(a)
2779− { arrContents = arrContents
2780− , arrStart = arrStart
2785− { arrContents = arrContents
2788− , arrBound = arrBound
2792-- | Create two slices of an array without copying the original array. The
2414-- | Create two slices of an array without copying the original array. The
2793-- specified index @i@ is the first index of the second slice.
2415-- specified index @i@ is the first index of the second slice.
2795−{-# INLINE splitAt #-}
2796splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2417splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2797−splitAt i arr =
2418+splitAt i arr@MutArray{..} =
2798 let maxIndex = length arr - 1
2419 let maxIndex = length arr - 1
2799 in if i < 0
2420 in if i < 0
2800 then error "sliceAt: negative array index"
2421 then error "sliceAt: negative array index"
2801 else if i > maxIndex
2422 else if i > maxIndex
2802 then error $ "sliceAt: specified array index " ++ show i
2423 then error $ "sliceAt: specified array index " ++ show i
2803 ++ " is beyond the maximum index " ++ show maxIndex
2424 ++ " is beyond the maximum index " ++ show maxIndex
2804− else unsafeSplitAt i arr
2425+ else let off = i * SIZE_OF(a)
2428+ { arrContents = arrContents
2429+ , arrStart = arrStart
2434+ { arrContents = arrContents
2437+ , arrBound = arrBound
2806-------------------------------------------------------------------------------
2441-------------------------------------------------------------------------------
2807-- Casting
2442-- Casting
@@ -2851,13 +2486,9 @@ cast arr =
2851-- guarantees that unsafe calls will be performed in the calling thread. Making
2486-- guarantees that unsafe calls will be performed in the calling thread. Making
2852-- it safe to pass heap-allocated objects to unsafe functions.
2487-- it safe to pass heap-allocated objects to unsafe functions.
2854−-- XXX Should we just name it asPtr, the unsafety is implicit for any pointer
2489+-- Should we just name it asPtr, the unsafety is implicit for any pointer
2855-- operations. And we are safe from Haskell perspective because we will be
2490-- operations. And we are safe from Haskell perspective because we will be
2856-- pinning the memory.
2491-- pinning the memory.
2858−-- XXX we cannot pass the length of the ptr here as in some cases it may not be
2859−-- available e.g. a null terminated C string. However, we can create another
2860−-- flavor of the API e.g. asPtrN.
2862-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
2493-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
2863-- array as a pointer to some operating system call or to a "safe" FFI call.
2494-- array as a pointer to some operating system call or to a "safe" FFI call.
@@ -2875,21 +2506,16 @@ cast arr =
2876-- /Pre-release/
2507-- /Pre-release/
2878−{-# INLINE unsafePinnedAsPtr #-}
2879−unsafePinnedAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2880−unsafePinnedAsPtr arr f =
2881− Unboxed.unsafePinnedAsPtr
2882− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2884−{-# DEPRECATED asPtrUnsafe "Please use unsafePinnedAsPtr instead." #-}
2885{-# INLINE asPtrUnsafe #-}
2509{-# INLINE asPtrUnsafe #-}
2886asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2510asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2887−asPtrUnsafe = unsafePinnedAsPtr
2511+asPtrUnsafe arr f =
2512+ Unboxed.asPtrUnsafe
2513+ (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2889−{-# INLINE unsafeAsPtr #-}
2515+{-# INLINE asUnpinnedPtrUnsafe #-}
2890−unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2516+asUnpinnedPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2891−unsafeAsPtr arr f =
2517+asUnpinnedPtrUnsafe arr f =
2892− Unboxed.unsafeAsPtr
2518+ Unboxed.asUnpinnedPtrUnsafe
2893 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2519 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2895-------------------------------------------------------------------------------
2521-------------------------------------------------------------------------------
@@ -2907,26 +2533,28 @@ unsafeAsPtr arr f =
2907-- /Pre-release/
2533-- /Pre-release/
2908{-# INLINE byteCmp #-}
2534{-# INLINE byteCmp #-}
2909byteCmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2535byteCmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2910−byteCmp arr1 arr2 = do
2536+byteCmp arr1 arr2 =
2911− let marr1 = getMutableByteArray# (arrContents arr1)
2539+ let marr1 = getMutableByteArray# (arrContents arr1)
2912− marr2 = getMutableByteArray# (arrContents arr2)
2540+ marr2 = getMutableByteArray# (arrContents arr2)
2913− !(I# st1#) = arrStart arr1
2541+ !(I# st1#) = arrStart arr1
2914− !(I# st2#) = arrStart arr2
2542+ !(I# st2#) = arrStart arr2
2915− !(I# len#) = byteLength arr1
2543+ !(I# len#) = byteLength arr1
2916− case compare (byteLength arr1) (byteLength arr2) of
2544+ case compare (byteLength arr1) (byteLength arr2) of
2917− EQ -> do
2545+ EQ -> do
2918− r <- liftIO $ IO $ \s# ->
2546+ r <- liftIO $ IO $ \s# ->
2919− let res =
2547+ let res =
2921− (compareByteArrays#
2549+ (compareByteArrays#
2922− (unsafeCoerce# marr1)
2550+ (unsafeCoerce# marr1)
2924− (unsafeCoerce# marr2)
2552+ (unsafeCoerce# marr2)
2927− in (# s#, res #)
2555+ in (# s#, res #)
2928− return $ compare r 0
2556+ return $ compare r 0
2929− x -> return x
2557+ x -> return x
2931{-# INLINE cmp #-}
2559{-# INLINE cmp #-}
2932{-# DEPRECATED cmp "Please use byteCmp instead." #-}
2560{-# DEPRECATED cmp "Please use byteCmp instead." #-}
@@ -2943,309 +2571,7 @@ byteEq :: MonadIO m => MutArray a -> MutArray a -> m Bool
2943byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
2571byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
2945-------------------------------------------------------------------------------
2573-------------------------------------------------------------------------------
2946−-- Compact
2574+-- NFData
2947−-------------------------------------------------------------------------------
2949−-- Note: LE versions avoid an extra copy compared to GE. LE parser trades
2950−-- backtracking one array in lieu of avoiding a copy. However, LE and GE both
2951−-- can leave some memory unused. They can split the last array to fit it
2952−-- exactly in the space.
2954−{-# INLINE_NORMAL pCompactLeAs #-}
2956− forall m a. (MonadIO m, Unbox a)
2957− => PinnedState -> Int -> Parser (MutArray a) m (MutArray a)
2958−pCompactLeAs ps maxElems = Parser step initial extract
2962− maxBytes = maxElems * SIZE_OF(a)
2964− functionName = "Streamly.Internal.Data.MutArray.pCompactLE"
2971− ++ ": the size of arrays ["
2972− ++ show maxElems ++ "] must be a natural number"
2973− else Parser.IPartial Nothing
2977− $ let len = byteLength arr
2978− in if len >= maxBytes
2979− then Parser.Done 0 arr
2980− else Parser.Partial 0 (Just arr)
2981− -- XXX Split the last array to use the space more compactly.
2982− step (Just buf) arr =
2983− let len = byteLength buf + byteLength arr
2984− in if len > maxBytes
2985− then return $ Parser.Done 1 buf
2988− if byteCapacity buf < maxBytes
2989− then liftIO $ reallocExplicitAs
2990− ps (SIZE_OF(a)) maxBytes buf
2992− buf2 <- spliceUnsafe buf1 arr
2993− return $ Parser.Partial 0 (Just buf2)
2995− extract Nothing = return $ Parser.Done 0 nil
2996− extract (Just buf) = return $ Parser.Done 0 buf
2998−-- | Parser @pCompactLE maxElems@ coalesces adjacent arrays in the input stream
2999−-- only if the combined size would be less than or equal to @maxElems@
3000−-- elements. Note that it won't split an array if the original array is already
3001−-- larger than maxElems.
3003−-- @maxElems@ must be greater than 0.
3005−-- Generates unpinned arrays irrespective of the pinning status of input
3009−{-# INLINE pCompactLE #-}
3011− forall m a. (MonadIO m, Unbox a)
3012− => Int -> Parser (MutArray a) m (MutArray a)
3013−pCompactLE = pCompactLeAs Unpinned
3015−-- | Pinned version of 'pCompactLE'.
3016−{-# INLINE pPinnedCompactLE #-}
3018− forall m a. (MonadIO m, Unbox a)
3019− => Int -> Parser (MutArray a) m (MutArray a)
3020−pPinnedCompactLE = pCompactLeAs Pinned
3022−data SpliceState s arr
3024− | SpliceBuffering s arr
3025− | SpliceYielding arr (SpliceState s arr)
3028−-- This mutates the first array (if it has space) to append values from the
3029−-- second one. This would work for immutable arrays as well because an
3030−-- immutable array never has additional space so a new array is allocated
3031−-- instead of mutating it.
3033−{-# INLINE_NORMAL compactLeAs #-}
3034−compactLeAs :: forall m a. (MonadIO m, Unbox a)
3035− => PinnedState -> Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
3036−compactLeAs ps maxElems (D.Stream step state) =
3037− D.Stream step' (SpliceInitial state)
3041− maxBytes = maxElems * SIZE_OF(a)
3043− functionName = "Streamly.Internal.Data.MutArray.rCompactLE"
3045− {-# INLINE_LATE step' #-}
3046− step' gst (SpliceInitial st) = do
3047− when (maxElems <= 0) $
3048− -- XXX we can pass the module string from the higher level API
3049− error $ functionName ++ ": the size of arrays [" ++ show maxElems
3050− ++ "] must be a natural number"
3053− D.Yield arr s -> return $
3054− let len = byteLength arr
3055− in if len >= maxBytes
3056− then D.Skip (SpliceYielding arr (SpliceInitial s))
3057− else D.Skip (SpliceBuffering s arr)
3058− D.Skip s -> return $ D.Skip (SpliceInitial s)
3059− D.Stop -> return D.Stop
3061− -- XXX Split the last array to use the space more compactly.
3062− step' gst (SpliceBuffering st buf) = do
3065− D.Yield arr s -> do
3066− let len = byteLength buf + byteLength arr
3069− D.Skip (SpliceYielding buf (SpliceBuffering s arr))
3071− buf1 <- if byteCapacity buf < maxBytes
3072− then liftIO $ reallocExplicitAs
3073− ps (SIZE_OF(a)) maxBytes buf
3075− buf2 <- spliceUnsafe buf1 arr
3076− return $ D.Skip (SpliceBuffering s buf2)
3077− D.Skip s -> return $ D.Skip (SpliceBuffering s buf)
3078− D.Stop -> return $ D.Skip (SpliceYielding buf SpliceFinish)
3080− step' _ SpliceFinish = return D.Stop
3082− step' _ (SpliceYielding arr next) = return $ D.Yield arr next
3085−{-# INLINE_NORMAL fCompactGeAs #-}
3087− forall m a. (MonadIO m, Unbox a)
3088− => PinnedState -> Int -> FL.Fold m (MutArray a) (MutArray a)
3089−fCompactGeAs ps minElems = Fold step initial extract extract
3093− minBytes = minElems * SIZE_OF(a)
3095− functionName = "Streamly.Internal.Data.MutArray.fCompactGE"
3102− ++ ": the size of arrays ["
3103− ++ show minElems ++ "] must be a natural number"
3104− else FL.Partial Nothing
3108− $ let len = byteLength arr
3109− in if len >= minBytes
3111− else FL.Partial (Just arr)
3112− -- XXX Buffer arrays as a list to avoid copy and reallocations
3113− step (Just buf) arr = do
3114− let len = byteLength buf + byteLength arr
3116− if byteCapacity buf < len
3117− then liftIO $ reallocExplicitAs
3118− ps (SIZE_OF(a)) (max minBytes len) buf
3120− buf2 <- spliceUnsafe buf1 arr
3122− then return $ FL.Done buf2
3123− else return $ FL.Partial (Just buf2)
3125− extract Nothing = return nil
3126− extract (Just buf) = return buf
3128−-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
3129−-- until the size becomes greater than or equal to @minElems@.
3131−-- Generates unpinned arrays irrespective of the pinning status of input
3133−{-# INLINE fCompactGE #-}
3135− forall m a. (MonadIO m, Unbox a)
3136− => Int -> FL.Fold m (MutArray a) (MutArray a)
3137−fCompactGE = fCompactGeAs Unpinned
3139−-- | Pinned version of 'fCompactGE'.
3140−{-# INLINE fPinnedCompactGE #-}
3142− forall m a. (MonadIO m, Unbox a)
3143− => Int -> FL.Fold m (MutArray a) (MutArray a)
3144−fPinnedCompactGE = fCompactGeAs Pinned
3146−{-# INLINE_NORMAL lCompactGeAs #-}
3147−lCompactGeAs :: forall m a. (MonadIO m, Unbox a)
3148− => PinnedState -> Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3149−-- The fold version turns out to be a little bit slower.
3150−-- lCompactGeAs ps n = FL.many (fCompactGeAs ps n)
3151−lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
3152− Fold step initial extract final
3156− minBytes = minElems * SIZE_OF(a)
3158− functionName = "Streamly.Internal.Data.MutArray.lCompactGE"
3161− when (minElems <= 0) $
3162− -- XXX we can pass the module string from the higher level API
3163− error $ functionName ++ ": the size of arrays ["
3164− ++ show minElems ++ "] must be a natural number"
3167− return $ first (Tuple' Nothing) r
3169− {-# INLINE runInner #-}
3170− runInner len acc buf =
3175− FL.Done _ -> return $ FL.Done ()
3179− return $ first (Tuple' Nothing) res
3180− else return $ FL.Partial $ Tuple' (Just buf) acc
3182− step (Tuple' Nothing r1) arr =
3183− runInner (byteLength arr) r1 arr
3185− -- XXX Buffer arrays as a list to avoid copy and reallocations
3186− step (Tuple' (Just buf) r1) arr = do
3187− let len = byteLength buf + byteLength arr
3188− buf1 <- if byteCapacity buf < len
3189− then liftIO $ reallocExplicitAs
3190− ps (SIZE_OF(a)) (max minBytes len) buf
3192− buf2 <- spliceUnsafe buf1 arr
3193− runInner len r1 buf2
3195− -- XXX Several folds do extract >=> final, therefore, we need to make final
3196− -- return "m b" rather than using extract post it if we want extract to be
3199− -- extract forces the pending buffer to be sent to the fold which is not
3201− extract _ = error "lCompactGE: not designed for scanning"
3203− final (Tuple' Nothing r1) = final1 r1
3204− final (Tuple' (Just buf) r1) = do
3207− FL.Partial rr -> final1 rr
3208− FL.Done _ -> return ()
3210−-- | Like 'compactGE' but for transforming folds instead of stream.
3212−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3214−-- Generates unpinned arrays irrespective of the pinning status of input
3216−{-# INLINE lCompactGE #-}
3217−lCompactGE :: forall m a. (MonadIO m, Unbox a)
3218− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3219−lCompactGE = lCompactGeAs Unpinned
3221−-- | Pinned version of 'lCompactGE'.
3222−{-# INLINE lPinnedCompactGE #-}
3223−lPinnedCompactGE :: forall m a. (MonadIO m, Unbox a)
3224− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3225−lPinnedCompactGE = lCompactGeAs Pinned
3227−-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3228−-- the size becomes greater than or equal to @n@.
3230−-- >>> compactGE n = Stream.foldMany (MutArray.fCompactGE n)
3232−{-# INLINE compactGE #-}
3234− (MonadIO m, Unbox a)
3235− => Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3236−compactGE n = D.foldMany (fCompactGE n)
3238−-- | 'compactEQ n' coalesces adajacent arrays in the input stream to
3239−-- arrays of exact size @n@.
3242−{-# INLINE compactEQ #-}
3243−compactEQ :: -- (MonadIO m, Unbox a) =>
3244− Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3245−compactEQ _n = undefined -- D.parseManyD (pCompactEQ n)
3247−-------------------------------------------------------------------------------
3248−-- In-place mutation algorithms
3249-------------------------------------------------------------------------------
2575-------------------------------------------------------------------------------
3251-- | Strip elements which match with predicate from both ends.
2577-- | Strip elements which match with predicate from both ends.