@@ -28,80 +28,57 @@
2828
2929module Streamly.Internal.Data.MutArray.Type
3030 (
31− -- ** Type
31+ -- * Type
3232 -- $arrayNotes
3333 MutArray (..)
34−
35− -- ** Conversion
36− -- *** Pinned and Unpinned
34+ , MutByteArray
35+ , MutableByteArray
3736 , pin
3837 , unpin
3938 , isPinned
4039
41− -- ** Casting
42− , cast
43− , castUnsafe -- XXX unsafeCast
44− , asBytes
45− , unsafePinnedAsPtr
46− , unsafeAsPtr
47−
40+ -- * Constructing and Writing
4841 -- ** Construction
49− , empty
50−
51− -- *** New
52− -- | New arrays are always empty arrays with some reserve capacity to
53− -- extend the length without reallocating.
54− , emptyOf
55− , newArrayWith -- emptyAlignedWith
56− , pinnedEmptyOf
57− , pinnedNewAligned -- XXX not required
58− -- , new -- uninitialized array of specified length
59−
60− -- *** Cloning
61− , clone
62− , pinnedClone
42+ , nil
6343
64− -- *** Slicing
65− -- | Get a subarray without copying
66− , getSliceUnsafe -- XXX unsafeGetSlice
67− , getSlice
68− , splitAt -- XXX should be able to express using getSlice
69− , breakOn
44+ -- *** Uninitialized Arrays
45+ , pinnedNew
46+ , pinnedNewBytes
47+ , pinnedNewAligned
48+ , new
49+ , newArrayWith
7050
71− -- *** Stream Folds
51+ -- *** From streams
7252 , ArrayUnsafe (..)
73− , unsafeCreateOfWith
74− , unsafeCreateOf
75− , unsafePinnedCreateOf
76− , pinnedCreateOf
77− , createOfWith
78− , createOf
79− , revCreateOf
80−
81− , pinnedCreate
82− , createWith
83− , create
84− -- , revCreate
85−
86− -- *** From containers
53+ , writeNWithUnsafe
54+ , writeNWith
55+ , writeNUnsafe
56+ , pinnedWriteNUnsafe
57+ , writeN
58+ , pinnedWriteN
59+ , pinnedWriteNAligned
60+
61+ , writeWith
62+ , write
63+ , pinnedWrite
64+
65+ , writeRevN
66+ -- , writeRev
67+
68+ -- ** From containers
8769 , fromListN
8870 , pinnedFromListN
8971 , fromList
9072 , pinnedFromList
9173 , fromListRevN
9274 , fromListRev
93− , fromStreamN
94− , fromStream
95− , fromPureStreamN
75+ , fromStreamDN
76+ , fromStreamD
9677 , fromPureStream
97− , fromByteStr#
98− , fromPtrN
99− , fromChunksK
100− , fromChunksRealloced -- fromSmallChunks
10178
102− -- ** Random writes
79+ -- * Random writes
10380 , putIndex
104− , putIndexUnsafe -- XXX unsafePutIndex
81+ , putIndexUnsafe
10582 , putIndices
10683 -- , putFromThenTo
10784 -- , putFrom -- start writing at the given position
@@ -109,71 +86,78 @@ module Streamly.Internal.Data.MutArray.Type
10986 -- , putFromTo
11087 -- , putFromRev
11188 -- , putUptoRev
112− , modifyIndexUnsafe -- XXX unsafeModifyIndex
89+ , modifyIndexUnsafe
11390 , modifyIndex
11491 , modifyIndices
11592 , modify
11693 , swapIndices
11794 , unsafeSwapIndices
11895
119− -- ** Reading
96+ -- * Growing and Shrinking
97+ -- Arrays grow only at the end, though it is possible to grow on both sides
98+ -- and therefore have a cons as well as snoc. But that will require two
99+ -- bounds in the array representation.
120100
121− -- *** Indexing
122− , getIndex
123− , getIndexUnsafe -- XXX unsafeGetIndex
124− -- , getFromThenTo
125− , getIndexRev -- getRevIndex?
126− , indexReader
127− , indexReaderWith
101+ -- ** Appending elements
102+ , snocWith
103+ , snoc
104+ , snocLinear
105+ , snocMay
106+ , snocUnsafe
128107
129− -- *** To Streams
108+ -- ** Appending streams
109+ , writeAppendNUnsafe
110+ , writeAppendN
111+ , writeAppendWith
112+ , writeAppend
113+
114+ -- * Eliminating and Reading
115+
116+ -- ** To streams
117+ , reader
118+ , readerRevWith
119+ , readerRev
120+
121+ -- ** To containers
122+ , toStreamDWith
123+ , toStreamDRevWith
124+ , toStreamKWith
125+ , toStreamKRevWith
130126 , read
131127 , readRev
132− , toStreamWith
133− , toStreamRevWith
134128 , toStreamK
135− , toStreamKWith
136129 , toStreamKRev
137− , toStreamKRevWith
138−
139− -- *** To Containers
140130 , toList
141131
142− -- *** Unfolds
143132 -- experimental
144133 , producerWith
145134 , producer
146135
147− , reader
148− , readerRevWith
149− , readerRev
150−
151− -- ** Size and Capacity
152− -- *** Size
153− , length
154− , byteLength
155−
156− -- *** Capacity
157− -- , capacity
158− , byteCapacity
159− , bytesFree
136+ -- ** Random reads
137+ , getIndex
138+ , getIndexUnsafe
139+ , getIndices
140+ , getIndicesD
141+ -- , getFromThenTo
142+ , getIndexRev
160143
161− -- *** Capacity Management
144+ -- * Memory Management
162145 , blockSize
163146 , arrayChunkBytes
164147 , allocBytesToElemCount
165− , realloc -- this is "resize"
166− , grow
167− , growExp
148+ , realloc
149+ , resize
150+ , resizeExp
168151 , rightSize
169152
170− -- ** Folding
171− , foldl'
172− , foldr
173− , byteCmp
174− , byteEq
153+ -- * Size
154+ , length
155+ , byteLength
156+ -- , capacity
157+ , byteCapacity
158+ , bytesFree
175159
176− -- ** In-place Mutation Algorithms
160+ -- * In-place Mutation Algorithms
177161 , strip
178162 , reverse
179163 , permute
@@ -183,121 +167,62 @@ module Streamly.Internal.Data.MutArray.Type
183167 , mergeBy
184168 , bubble
185169
186− -- ** Growing and Shrinking
187− -- | Arrays grow only at the end, though it is possible to grow on both
188− -- sides and therefore have a cons as well as snoc. But that will require
189− -- both lower and upper bound in the array representation.
190−
191− -- *** Appending elements
192− , snocWith
193− , snoc
194− , snocLinear
195− , snocMay
196− , snocUnsafe -- XXX unsafeSnoc
197−
198− -- *** Appending streams
199− , unsafeAppendN
200− , appendN
201− , appendWith
202− , append
203−
204− -- *** Appending arrays
205− , spliceCopy
206− , spliceWith
207− , splice
208− , spliceExp
209− , spliceUnsafe -- XXX unsafeSplice
210− -- , putSlice
211− -- , appendSlice
212− -- , appendSliceFrom
213−
214− -- ** Serialization using Unbox
215− , pokeAppend
216− , pokeAppendMay
217− , pokeSkipUnsafe -- unsafePokeSkip
170+ -- * Casting
171+ , cast
172+ , castUnsafe
173+ , asBytes
174+ , asPtrUnsafe
218175
219− -- ** Deserialization using Unbox
220− , peekUncons
221− , peekUnconsUnsafe -- unsafePeekUncons
222− , peekSkipUnsafe -- unsafePeekSkip
176+ -- * Folding
177+ , foldl'
178+ , foldr
179+ , cmp
223180
224− -- Arrays of arrays
181+ -- * Arrays of arrays
225182 -- We can add dimensionality parameter to the array type to get
226183 -- multidimensional arrays. Multidimensional arrays would just be a
227184 -- convenience wrapper on top of single dimensional arrays.
228185
229− -- ** Streams of Arrays
230− -- *** Chunk
231− -- | Group a stream into arrays.
186+ -- | Operations dealing with multiple arrays, streams of arrays or
187+ -- multidimensional array representations.
188+
189+ -- ** Construct from streams
232190 , chunksOf
233191 , pinnedChunksOf
234− , buildChunks
192+ , writeChunks
235193
236− -- *** Split
237− -- | Split an array into slices.
194+ -- ** Eliminate to streams
195+ , flattenArrays
196+ , flattenArraysRev
197+ , fromArrayStreamK
238198
199+ -- ** Construct from arrays
200+ -- get chunks without copying
201+ , getSliceUnsafe
202+ , getSlice
239203 -- , getSlicesFromLenN
240− , splitOn
241− -- , slicesOf
242−
243− -- *** Concat
244− -- | Append the arrays in a stream to form a stream of elements.
245− , concatWith
246− , concatRevWith
247− , concat
248− , concatRev
249−
250− -- *** Compact
251− -- | Append the arrays in a stream to form a stream of larger arrays.
252− , SpliceState (..)
253− , pCompactLE
254− , pPinnedCompactLE
255− , compactLeAs
256− , fCompactGE
257− , fPinnedCompactGE
258− , lCompactGE
259− , lPinnedCompactGE
260− , compactGE
261− , compactEQ
262−
263− -- ** Utilities
204+ , splitAt -- XXX should be able to express using getSlice
205+ , breakOn
206+
207+ -- ** Cloning arrays
208+ , clone
209+ , pinnedClone
210+
211+ -- ** Appending arrays
212+ , spliceCopy
213+ , spliceWith
214+ , splice
215+ , spliceExp
216+ , spliceUnsafe
217+ -- , putSlice
218+ -- , appendSlice
219+ -- , appendSliceFrom
220+
221+ -- * Utilities
264222 , roundUpToPower2
265223 , memcpy
266224 , memcmp
267225 , c_memchr
268−
269− -- * Deprecated
270− , asPtrUnsafe
271− , writeChunks
272− , flattenArrays
273− , flattenArraysRev
274− , fromArrayStreamK
275− , fromStreamDN
276− , fromStreamD
277− , cmp
278− , getIndices
279− , getIndicesWith
280− , resize
281− , resizeExp
282− , nil
283− , new
284− , pinnedNew
285− , pinnedNewBytes
286− , writeAppendNUnsafe
287− , writeAppendN
288− , writeAppendWith
289− , writeAppend
290− , writeNWithUnsafe
291− , writeNWith
292− , writeNUnsafe
293− , pinnedWriteNUnsafe
294− , writeN
295− , pinnedWriteN
296− , pinnedWriteNAligned -- XXX not required
297− , writeWith
298− , write
299− , pinnedWrite
300− , writeRevN
301226 )
302227where
303228
@@ -308,15 +233,15 @@ where
308233
309234import Control.Monad (when, void)
310235import Control.Monad.IO.Class (MonadIO(..))
311−import Data.Bifunctor (first)
312236import Data.Bits (shiftR, (.|.), (.&.))
313237import Data.Functor.Identity (Identity(..))
314238import Data.Proxy (Proxy(..))
315239import Data.Word (Word8)
316240import Foreign.C.Types (CSize(..), CInt(..))
317241import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
318−import Streamly.Internal.Data.MutByteArray.Type
242+import Streamly.Internal.Data.MutByteArray
319243 ( MutByteArray(..)
244+ , MutableByteArray
320245 , PinnedState(..)
321246 , getMutableByteArray#
322247 , putSliceUnsafe
@@ -329,23 +254,19 @@ import GHC.Base
329254 , copyMutableByteArray#
330255 )
331256import GHC.Base (noinline)
332−import GHC.Exts (unsafeCoerce#, Addr#)
257+import GHC.Exts (unsafeCoerce#)
333258import GHC.Ptr (Ptr(..))
334259
335260import Streamly.Internal.Data.Fold.Type (Fold(..))
336261import Streamly.Internal.Data.Producer.Type (Producer (..))
337262import Streamly.Internal.Data.Stream.Type (Stream)
338−import Streamly.Internal.Data.Parser.Type (Parser (..))
339263import Streamly.Internal.Data.StreamK.Type (StreamK)
340264import Streamly.Internal.Data.SVar.Type (adaptState, defState)
341−import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
342265import Streamly.Internal.Data.Unfold.Type (Unfold(..))
343266import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
344267
345268import qualified Streamly.Internal.Data.Fold.Type as FL
346−import 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
269+import qualified Streamly.Internal.Data.MutByteArray as Unboxed
349270import qualified Streamly.Internal.Data.Producer as Producer
350271import qualified Streamly.Internal.Data.Stream.Type as D
351272import qualified Streamly.Internal.Data.Stream.Lift as D
@@ -353,7 +274,7 @@ import qualified Streamly.Internal.Data.StreamK.Type as K
353274import qualified Prelude
354275
355276import Prelude hiding
356− (Foldable(..), concat, read, unlines, splitAt, reverse, truncate)
277+ (Foldable(..), read, unlines, splitAt, reverse, truncate)
357278
358279#include "DocTestDataMutArray.hs"
359280
@@ -361,7 +282,6 @@ import Prelude hiding
361282-- Foreign helpers
362283-------------------------------------------------------------------------------
363284
364−-- NOTE: Have to be "ccall unsafe" so that we can pass unpinned memory to these
365285foreign import ccall unsafe "string.h memcpy" c_memcpy
366286 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO (Ptr Word8)
367287
@@ -371,9 +291,6 @@ foreign import ccall unsafe "string.h memchr" c_memchr
371291foreign import ccall unsafe "string.h memcmp" c_memcmp
372292 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO CInt
373293
374−foreign import ccall unsafe "string.h strlen" c_strlen
375− :: Ptr Word8 -> IO CSize
376−
377294-- | Given an 'Unboxed' type (unused first arg) and a number of bytes, return
378295-- how many elements of that type will completely fit in those bytes.
379296--
@@ -440,8 +357,8 @@ data MutArray a =
440357-- Pinning & Unpinning
441358-------------------------------------------------------------------------------
442359
443−-- | Return a copy of the array in pinned memory if unpinned, else return the
444−-- original array.
360+-- | Copy the 'MutArray' to pinned memory if unpinned, else do nothing. The
361+-- overhead is a copy if the input array is unpinned.
445362{-# INLINE pin #-}
446363pin :: MutArray a -> IO (MutArray a)
447364pin arr@MutArray{..} =
@@ -449,8 +366,8 @@ pin arr@MutArray{..} =
449366 then pure arr
450367 else pinnedClone arr
451368
452−-- | Return a copy of the array in unpinned memory if pinned, else return the
453−-- original array.
369+-- | Copy the 'MutArray' to unpinned memory if pinned, else do nothing. The
370+-- overhead is a copy if the input array is pinned.
454371{-# INLINE unpin #-}
455372unpin :: MutArray a -> IO (MutArray a)
456373unpin arr@MutArray{..} =
@@ -458,7 +375,6 @@ unpin arr@MutArray{..} =
458375 then clone arr
459376 else pure arr
460377
461−-- | Return 'True' if the array is allocated in pinned memory.
462378{-# INLINE isPinned #-}
463379isPinned :: MutArray a -> Bool
464380isPinned MutArray{..} = Unboxed.isPinned arrContents
@@ -479,8 +395,6 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
479395-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
480396-- allocatePinned in GHC source.
481397
482−-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
483−
484398-- | @newArrayWith allocator alignment count@ allocates a new array of zero
485399-- length and with a capacity to hold @count@ elements, using @allocator
486400-- size alignment@ as the memory allocator function.
@@ -504,25 +418,12 @@ newArrayWith alloc alignSize count = do
504418 , arrBound = size
505419 }
506420
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.
510−
511−-- | Create an empty array.
512−empty ::
513−#ifdef DEVBUILD
514− Unbox a =>
515−#endif
516− MutArray a
517−empty = MutArray Unboxed.empty 0 0 0
518−
519−{-# DEPRECATED nil "Please use empty instead." #-}
520421nil ::
521422#ifdef DEVBUILD
522423 Unbox a =>
523424#endif
524425 MutArray a
525−nil = empty
426+nil = MutArray Unboxed.nil 0 0 0
526427
527428{-# INLINE newBytesAs #-}
528429newBytesAs :: MonadIO m =>
@@ -539,13 +440,12 @@ newBytesAs ps bytes = do
539440 , arrBound = bytes
540441 }
541442
542−-- | Allocates a pinned empty array that with a reserved capacity of bytes.
543−-- The memory of the array is uninitialized and the allocation is aligned as
544−-- per the 'Unboxed' instance of the type.
443+-- | Allocates a pinned empty array that can hold 'count' items. The memory of
444+-- the array is uninitialized and the allocation is aligned as per the
445+-- 'Unboxed' instance of the type.
545446--
546447-- /Pre-release/
547448{-# INLINE pinnedNewBytes #-}
548−{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
549449pinnedNewBytes :: MonadIO m =>
550450#ifdef DEVBUILD
551451 Unbox a =>
@@ -570,31 +470,21 @@ newAs ps =
570470 (error "new: alignment is not used in unpinned arrays.")
571471
572472-- XXX can unaligned allocation be more efficient when alignment is not needed?
573−
574−-- | Allocates a pinned array of zero length but growable to the specified
575−-- capacity without reallocation.
576−{-# INLINE pinnedEmptyOf #-}
577−pinnedEmptyOf :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
578−pinnedEmptyOf = newAs Pinned
579−
580−-- XXX Deprecate in major
581−-- {-# DEPRECATED pinnedNew "Please use pinnedEmptyOf instead." #-}
473+--
474+-- | Allocates an empty pinned array that can hold 'count' items. The memory of
475+-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
476+-- instance of the type.
477+--
582478{-# INLINE pinnedNew #-}
583479pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
584−pinnedNew = pinnedEmptyOf
480+pinnedNew = newAs Pinned
585481
586−-- | Allocates an unpinned array of zero length but growable to the specified
587−-- capacity without reallocation.
482+-- | Allocates an empty unpinned array that can hold 'count' items. The memory
483+-- of the array is uninitialized.
588484--
589−{-# INLINE emptyOf #-}
590−emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591−emptyOf = newAs Unpinned
592−
593−-- XXX Deprecate in major
594−-- {-# DEPRECATED new "Please use emptyOf instead." #-}
595485{-# INLINE new #-}
596486new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
597−new = emptyOf
487+new = newAs Unpinned
598488
599489-------------------------------------------------------------------------------
600490-- Random writes
@@ -610,7 +500,7 @@ putIndexUnsafe :: forall m a. (MonadIO m, Unbox a)
610500putIndexUnsafe i MutArray{..} x = do
611501 let index = INDEX_OF(arrStart, i, a)
612502 assert (i >= 0 && INDEX_VALID(index, arrEnd, a)) (return ())
613− liftIO $ pokeAt index arrContents x
503+ liftIO $ pokeByteIndex index arrContents x
614504
615505invalidIndex :: String -> Int -> a
616506invalidIndex label i =
@@ -628,7 +518,7 @@ putIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m ()
628518putIndex i MutArray{..} x = do
629519 let index = INDEX_OF(arrStart,i,a)
630520 if i >= 0 && INDEX_VALID(index,arrEnd,a)
631− then liftIO $ pokeAt index arrContents x
521+ then liftIO $ pokeByteIndex index arrContents x
632522 else invalidIndex "putIndex" i
633523
634524-- | Write an input stream of (index, value) pairs to an array. Throws an
@@ -642,7 +532,7 @@ putIndices arr = FL.foldlM' step (return ())
642532
643533 where
644534
645− step () (i, x) = putIndex i arr x
535+ step () (i, x) = liftIO (putIndex i arr x)
646536
647537-- | Modify a given index of an array using a modifier function.
648538--
@@ -654,9 +544,9 @@ modifyIndexUnsafe :: forall m a b. (MonadIO m, Unbox a) =>
654544modifyIndexUnsafe i MutArray{..} f = liftIO $ do
655545 let index = INDEX_OF(arrStart,i,a)
656546 assert (i >= 0 && INDEX_NEXT(index,a) <= arrEnd) (return ())
657− r <- peekAt index arrContents
547+ r <- peekByteIndex index arrContents
658548 let (x, res) = f r
659− pokeAt index arrContents x
549+ pokeByteIndex index arrContents x
660550 return res
661551
662552-- | Modify a given index of an array using a modifier function.
@@ -668,9 +558,9 @@ modifyIndex i MutArray{..} f = do
668558 let index = INDEX_OF(arrStart,i,a)
669559 if i >= 0 && INDEX_VALID(index,arrEnd,a)
670560 then liftIO $ do
671− r <- peekAt index arrContents
561+ r <- peekByteIndex index arrContents
672562 let (x, res) = f r
673− pokeAt index arrContents x
563+ pokeByteIndex index arrContents x
674564 return res
675565 else invalidIndex "modifyIndex" i
676566
@@ -704,8 +594,8 @@ modify MutArray{..} f = liftIO $
704594
705595 go i =
706596 when (INDEX_VALID(i,arrEnd,a)) $ do
707− r <- peekAt i arrContents
708− pokeAt i arrContents (f r)
597+ r <- peekByteIndex i arrContents
598+ pokeByteIndex i arrContents (f r)
709599 go (INDEX_NEXT(i,a))
710600
711601-- XXX We could specify the number of bytes to swap instead of Proxy. Need
@@ -719,10 +609,10 @@ swapArrayByteIndices ::
719609 -> Int
720610 -> IO ()
721611swapArrayByteIndices _ arrContents i1 i2 = do
722− r1 <- peekAt i1 arrContents
723− r2 <- peekAt i2 arrContents
724− pokeAt i1 arrContents (r2 :: a)
725− pokeAt i2 arrContents (r1 :: a)
612+ r1 <- peekByteIndex i1 arrContents
613+ r2 <- peekByteIndex i2 arrContents
614+ pokeByteIndex i1 arrContents (r2 :: a)
615+ pokeByteIndex i2 arrContents (r1 :: a)
726616
727617-- | Swap the elements at two indices without validating the indices.
728618--
@@ -838,21 +728,24 @@ arrayChunkBytes = 1024
838728roundDownTo :: Int -> Int -> Int
839729roundDownTo elemSize size = size - (size `mod` elemSize)
840730
731+-- XXX See if resizing can be implemented by reading the old array as a stream
732+-- and then using writeN to the new array.
733+--
841734-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
842735-- Since this is not inlined Unboxed consrraint leads to dictionary passing
843736-- which complicates some inspection tests.
844737--
845−{-# NOINLINE reallocExplicitAs #-}
846−reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
847−reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
738+{-# NOINLINE reallocExplicit #-}
739+reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
740+reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
848741 assertM(arrEnd <= arrBound)
849742
850743 -- Allocate new array
851744 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
852745 contents <-
853− if ps == Pinned
854− then Unboxed.pinnedNew newCapMaxInBytes
855− else Unboxed.new newCapMaxInBytes
746+ if Unboxed.isPinned arrContents
747+ then Unboxed.pinnedNewByteArray newCapMaxInBytes
748+ else Unboxed.newByteArray newCapMaxInBytes
856749 let !(MutByteArray mbarrFrom#) = arrContents
857750 !(MutByteArray mbarrTo#) = contents
858751
@@ -875,10 +768,6 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
875768 , arrBound = newCapInBytes
876769 }
877770
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.
881−
882771-- | @realloc newCapacity array@ reallocates the array to the specified
883772-- capacity in bytes.
884773--
@@ -890,12 +779,7 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
890779-- If the original array is pinned, the newly allocated array is also pinned.
891780{-# INLINABLE realloc #-}
892781realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
893−realloc bytes arr =
894− let ps =
895− if isPinned arr
896− then Pinned
897− else Unpinned
898− in liftIO $ reallocExplicitAs ps (SIZE_OF(a)) bytes arr
782+realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
899783
900784-- | @reallocWith label capSizer minIncrBytes array@. The label is used
901785-- in error messages and the capSizer is used to determine the capacity of the
@@ -918,14 +802,14 @@ reallocWith label capSizer minIncrBytes arr = do
918802 where
919803
920804 badSize newSize =
921− Prelude.concat
805+ concat
922806 [ label
923807 , ": new array size (in bytes) is less than required size "
924808 , show newSize
925809 , ". Please check the sizing function passed."
926810 ]
927811
928−-- | @grow newCapacity array@ changes the total capacity of the array so that
812+-- | @resize newCapacity array@ changes the total capacity of the array so that
929813-- it is enough to hold the specified number of elements. Nothing is done if
930814-- the specified capacity is less than the length of the array.
931815--
@@ -933,46 +817,34 @@ reallocWith label capSizer minIncrBytes arr = do
933817-- the block size (4K).
934818--
935819-- /Pre-release/
936−{-# INLINE grow #-}
937−grow :: forall m a. (MonadIO m, Unbox a) =>
820+{-# INLINE resize #-}
821+resize :: forall m a. (MonadIO m, Unbox a) =>
938822 Int -> MutArray a -> m (MutArray a)
939−grow nElems arr@MutArray{..} = do
823+resize nElems arr@MutArray{..} = do
940824 let req = SIZE_OF(a) * nElems
941− cap = arrBound - arrStart
942− if req < cap
825+ len = arrEnd - arrStart
826+ if req < len
943827 then return arr
944828 else realloc req arr
945829
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)
950−resize = grow
951−
952−-- | Like 'grow' but if the requested byte capacity is more than
953−-- 'largeObjectThreshold' then it is rounded up to the closest power of 2.
830+-- | Like 'resize' but if the byte capacity is more than 'largeObjectThreshold'
831+-- then it is rounded up to the closest power of 2.
954832--
955833-- /Pre-release/
956−{-# INLINE growExp #-}
957−growExp :: forall m a. (MonadIO m, Unbox a) =>
834+{-# INLINE resizeExp #-}
835+resizeExp :: forall m a. (MonadIO m, Unbox a) =>
958836 Int -> MutArray a -> m (MutArray a)
959−growExp nElems arr@MutArray{..} = do
837+resizeExp nElems arr@MutArray{..} = do
960838 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
961839 req1 =
962840 if req > largeObjectThreshold
963841 then roundUpToPower2 req
964842 else req
965− cap = arrBound - arrStart
966− if req1 < cap
843+ len = arrEnd - arrStart
844+ if req1 < len
967845 then return arr
968846 else realloc req1 arr
969847
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)
974−resizeExp = growExp
975−
976848-- | Resize the allocated memory to drop any reserved free space at the end of
977849-- the array and reallocate it to reduce wastage.
978850--
@@ -1017,7 +889,7 @@ rightSize arr@MutArray{..} = do
1017889snocNewEnd :: (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m (MutArray a)
1018890snocNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1019891 assert (newEnd <= arrBound) (return ())
1020− pokeAt arrEnd arrContents x
892+ pokeByteIndex arrEnd arrContents x
1021893 return $ arr {arrEnd = newEnd}
1022894
1023895-- | Really really unsafe, appends the element into the first array, may
@@ -1037,7 +909,7 @@ snocUnsafe arr@MutArray{..} = snocNewEnd (INDEX_NEXT(arrEnd,a)) arr
1037909{-# INLINE snocMay #-}
1038910snocMay :: forall m a. (MonadIO m, Unbox a) =>
1039911 MutArray a -> a -> m (Maybe (MutArray a))
1040−snocMay arr@MutArray{..} x = do
912+snocMay arr@MutArray{..} x = liftIO $ do
1041913 let newEnd = INDEX_NEXT(arrEnd,a)
1042914 if newEnd <= arrBound
1043915 then Just <$> snocNewEnd newEnd arr x
@@ -1051,7 +923,7 @@ snocWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1051923 -> a
1052924 -> m (MutArray a)
1053925snocWithRealloc sizer arr x = do
1054− arr1 <- reallocWith "snocWith" sizer (SIZE_OF(a)) arr
926+ arr1 <- liftIO $ reallocWith "snocWith" sizer (SIZE_OF(a)) arr
1055927 snocUnsafe arr1 x
1056928
1057929-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
@@ -1073,7 +945,7 @@ snocWith :: forall m a. (MonadIO m, Unbox a) =>
1073945 -> MutArray a
1074946 -> a
1075947 -> m (MutArray a)
1076−snocWith allocSize arr x = do
948+snocWith allocSize arr x = liftIO $ do
1077949 let newEnd = INDEX_NEXT(arrEnd arr,a)
1078950 if newEnd <= arrBound arr
1079951 then snocNewEnd newEnd arr x
@@ -1117,126 +989,6 @@ snoc = snocWith f
1117989 then oldSize * 2
1118990 else roundUpToPower2 oldSize * 2
1119991
1120−-------------------------------------------------------------------------------
1121−-- Serialization/Deserialization
1122−-------------------------------------------------------------------------------
1123−
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}
1131−
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
1135−-- element.
1136−--
1137−-- /Internal/
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
1142−
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})
1150−
1151−-- | Like 'pokeAppend' but does not grow the array when pre-allocated array
1152−-- capacity becomes full.
1153−--
1154−-- /Internal/
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
1163−
1164−{-# NOINLINE pokeWithRealloc #-}
1165−pokeWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1166− (Int -> Int)
1167− -> MutArray Word8
1168− -> 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
1173−
1174−{-# INLINE pokeAppendWith #-}
1175−pokeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1176− (Int -> Int)
1177− -> MutArray Word8
1178− -> 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
1185−
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.
1188−--
1189−-- Definition:
1190−--
1191−-- >>> pokeAppend arr x = MutArray.castUnsafe <$> MutArray.snoc (MutArray.castUnsafe arr) x
1192−--
1193−{-# INLINE pokeAppend #-}
1194−pokeAppend :: forall m a. (MonadIO m, Unbox a) =>
1195− MutArray Word8 -> a -> m (MutArray Word8)
1196−pokeAppend = pokeAppendWith f
1197−
1198− where
1199−
1200− f oldSize =
1201− if isPower2 oldSize
1202− then oldSize * 2
1203− else roundUpToPower2 oldSize * 2
1204−
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.
1208−--
1209−-- /Internal/
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 ())
1216− liftIO $ do
1217− r <- peekAt arrStart arrContents
1218− return (r, MutArray arrContents start1 arrEnd arrBound)
1219−
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)
1226−
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)
1234− if start1 > arrEnd
1235− then return (Nothing, arr)
1236− else liftIO $ do
1237− r <- peekAt arrStart arrContents
1238− return (Just r, MutArray arrContents start1 arrEnd arrBound)
1239−
1240992-------------------------------------------------------------------------------
1241993-- Random reads
1242994-------------------------------------------------------------------------------
@@ -1251,7 +1003,7 @@ getIndexUnsafe :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
12511003getIndexUnsafe i MutArray{..} = do
12521004 let index = INDEX_OF(arrStart,i,a)
12531005 assert (i >= 0 && INDEX_VALID(index,arrEnd,a)) (return ())
1254− liftIO $ peekAt index arrContents
1006+ liftIO $ peekByteIndex index arrContents
12551007
12561008-- | /O(1)/ Lookup the element at the given index. Index starts from 0.
12571009--
@@ -1260,7 +1012,7 @@ getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (Maybe a)
12601012getIndex i MutArray{..} = do
12611013 let index = INDEX_OF(arrStart,i,a)
12621014 if i >= 0 && INDEX_VALID(index,arrEnd,a)
1263− then liftIO $ Just <$> peekAt index arrContents
1015+ then liftIO $ Just <$> peekByteIndex index arrContents
12641016 else return Nothing
12651017
12661018-- | /O(1)/ Lookup the element at the given index from the end of the array.
@@ -1273,16 +1025,21 @@ getIndexRev :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
12731025getIndexRev i MutArray{..} = do
12741026 let index = RINDEX_OF(arrEnd,i,a)
12751027 if i >= 0 && index >= arrStart
1276− then liftIO $ peekAt index arrContents
1028+ then liftIO $ peekByteIndex index arrContents
12771029 else invalidIndex "getIndexRev" i
12781030
12791031data GetIndicesState contents start end st =
12801032 GetIndicesState contents start end st
12811033
1282−{-# INLINE indexReaderWith #-}
1283−indexReaderWith :: (Monad m, Unbox a) =>
1034+-- | Given an unfold that generates array indices, read the elements on those
1035+-- indices from the supplied MutArray. An error is thrown if an index is out of
1036+-- bounds.
1037+--
1038+-- /Pre-release/
1039+{-# INLINE getIndicesD #-}
1040+getIndicesD :: (Monad m, Unbox a) =>
12841041 (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
1042+getIndicesD liftio (D.Stream stepi sti) = Unfold step inject
12861043
12871044 where
12881045
@@ -1301,26 +1058,9 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
13011058 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
13021059 D.Stop -> return D.Stop
13031060
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
1309−
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
1312−-- bounds.
1313−--
1314−-- /Pre-release/
1315−{-# INLINE indexReader #-}
1316−indexReader :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1317−indexReader = indexReaderWith liftIO
1318−
1319−-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1320−{-# DEPRECATED getIndices "Please use indexReader instead." #-}
13211061{-# INLINE getIndices #-}
13221062getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1323−getIndices = indexReader
1063+getIndices = getIndicesD liftIO
13241064
13251065-------------------------------------------------------------------------------
13261066-- Subarrays
@@ -1425,7 +1165,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14251165
14261166 -- Invariant low < high on entry, and on return as well
14271167 moveHigh low high = do
1428− h <- peekAt high arrContents
1168+ h <- peekByteIndex high arrContents
14291169 if f h
14301170 then
14311171 -- Correctly classified, continue the loop
@@ -1445,7 +1185,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14451185 -- low <= high
14461186 -- Both low and high are valid locations within the array
14471187 go low high = do
1448− l <- peekAt low arrContents
1188+ l <- peekByteIndex low arrContents
14491189 if f l
14501190 then
14511191 -- low is wrongly classified
@@ -1456,8 +1196,8 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14561196 case r of
14571197 Nothing -> return low
14581198 Just (high1, h) -> do -- low < high1
1459− pokeAt low arrContents h
1460− pokeAt high1 arrContents l
1199+ pokeByteIndex low arrContents h
1200+ pokeByteIndex high1 arrContents l
14611201 let low1 = INDEX_NEXT(low,a)
14621202 high2 = INDEX_PREV(high1,a)
14631203 if low1 <= high2
@@ -1591,7 +1331,7 @@ chunksOfAs ps n (D.Stream step state) =
15911331 r <- step (adaptState gst) st
15921332 case r of
15931333 D.Yield x s -> do
1594− liftIO $ pokeAt end contents x
1334+ liftIO $ pokeByteIndex end contents x
15951335 let end1 = INDEX_NEXT(end,a)
15961336 return $
15971337 if end1 >= bound
@@ -1615,7 +1355,7 @@ chunksOfAs ps n (D.Stream step state) =
16151355--
16161356-- Same as the following but may be more efficient:
16171357--
1618−-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
1358+-- >>> chunksOf n = Stream.foldMany (MutArray.writeN n)
16191359--
16201360-- /Pre-release/
16211361{-# INLINE_NORMAL chunksOf #-}
@@ -1624,29 +1364,17 @@ chunksOf :: forall m a. (MonadIO m, Unbox a)
16241364-- XXX the idiomatic implementation leads to large regression in the D.reverse'
16251365-- benchmark. It seems it has difficulty producing optimized code when
16261366-- converting to StreamK. Investigate GHC optimizations.
1627−-- chunksOf n = D.foldMany (createOf n)
1367+-- chunksOf n = D.foldMany (writeN n)
16281368chunksOf = chunksOfAs Unpinned
16291369
16301370-- | Like 'chunksOf' but creates pinned arrays.
16311371{-# INLINE_NORMAL pinnedChunksOf #-}
16321372pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
16331373 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1634−-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
1374+-- pinnedChunksOf n = D.foldMany (pinnedWriteN n)
16351375pinnedChunksOf = chunksOfAs Pinned
16361376
1637−-- | When we are buffering a stream of unknown size into an array we do not
1638−-- know how much space to pre-allocate. So we start with the min size and emit
1639−-- the array then keep on doubling the size every time. Thus we do not need to
1640−-- guess the optimum chunk size.
1641−--
1642−-- We can incorporate this in chunksOfAs if the additional size parameter does
1643−-- not impact perf.
1644−--
1645−{-# INLINE _chunksOfRange #-}
1646−_chunksOfRange :: -- (MonadIO m, Unbox a) =>
1647− PinnedState -> Int -> Int -> D.Stream m a -> D.Stream m (MutArray a)
1648−_chunksOfRange _ps _low _hi = undefined
1649−
1377+-- XXX This should take a PinnedState
16501378-- XXX buffer to a list instead?
16511379-- | Buffer the stream into arrays in memory.
16521380{-# INLINE arrayStreamKFromStreamDAs #-}
@@ -1664,10 +1392,16 @@ data FlattenState s contents a =
16641392 OuterLoop s
16651393 | InnerLoop s contents !Int !Int
16661394
1667−{-# INLINE_NORMAL concatWith #-}
1668−concatWith :: forall m a. (Monad m, Unbox a)
1669− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1670−concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1395+-- | Use the "reader" unfold instead.
1396+--
1397+-- @flattenArrays = unfoldMany reader@
1398+--
1399+-- We can try this if there are any fusion issues in the unfold.
1400+--
1401+{-# INLINE_NORMAL flattenArrays #-}
1402+flattenArrays :: forall m a. (MonadIO m, Unbox a)
1403+ => D.Stream m (MutArray a) -> D.Stream m a
1404+flattenArrays (D.Stream step state) = D.Stream step' (OuterLoop state)
16711405
16721406 where
16731407
@@ -1684,30 +1418,19 @@ concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
16841418 return $ D.Skip $ OuterLoop st
16851419
16861420 step' _ (InnerLoop st contents p end) = do
1687− x <- liftio $ peekAt p contents
1421+ x <- liftIO $ peekByteIndex p contents
16881422 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
16891423
1690−-- | Use the "reader" unfold instead.
1424+-- | Use the "readerRev" unfold instead.
16911425--
1692−-- @concat = unfoldMany reader@
1426+-- @flattenArrays = unfoldMany readerRev@
16931427--
16941428-- We can try this if there are any fusion issues in the unfold.
16951429--
1696−{-# INLINE_NORMAL concat #-}
1697−concat :: forall m a. (MonadIO m, Unbox a)
1698− => D.Stream m (MutArray a) -> D.Stream m a
1699−concat = concatWith liftIO
1700−
1701−{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1702−{-# INLINE flattenArrays #-}
1703−flattenArrays :: forall m a. (MonadIO m, Unbox a)
1430+{-# INLINE_NORMAL flattenArraysRev #-}
1431+flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
17041432 => D.Stream m (MutArray a) -> D.Stream m a
1705−flattenArrays = concat
1706−
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)
1433+flattenArraysRev (D.Stream step state) = D.Stream step' (OuterLoop state)
17111434
17121435 where
17131436
@@ -1725,27 +1448,10 @@ concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
17251448 return $ D.Skip $ OuterLoop st
17261449
17271450 step' _ (InnerLoop st contents p start) = do
1728− x <- liftio $ peekAt p contents
1451+ x <- liftIO $ peekByteIndex p contents
17291452 let cur = INDEX_PREV(p,a)
17301453 return $ D.Yield x (InnerLoop st contents cur start)
17311454
1732−-- | Use the "readerRev" unfold instead.
1733−--
1734−-- @concat = unfoldMany readerRev@
1735−--
1736−-- We can try this if there are any fusion issues in the unfold.
1737−--
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
1742−
1743−{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1744−{-# INLINE flattenArraysRev #-}
1745−flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1746− => D.Stream m (MutArray a) -> D.Stream m a
1747−flattenArraysRev = concatRev
1748−
17491455-------------------------------------------------------------------------------
17501456-- Unfolds
17511457-------------------------------------------------------------------------------
@@ -1781,7 +1487,7 @@ producerWith liftio = Producer step (return . toArrayUnsafe) extract
17811487 -- few actions for correctness and execution order sanity. We want
17821488 -- the peek to occur right here and not lazily at some later point
17831489 -- because we want the peek to be ordered with respect to the touch.
1784− !x <- liftio $ peekAt cur contents
1490+ !x <- liftio $ peekByteIndex cur contents
17851491 return $ D.Yield x (ArrayUnsafe contents (INDEX_NEXT(cur,a)) end)
17861492
17871493 extract = return . fromArrayUnsafe
@@ -1812,7 +1518,7 @@ readerRevWith liftio = Unfold step inject
18121518 {-# INLINE_LATE step #-}
18131519 step (ArrayUnsafe _ start p) | p < start = return D.Stop
18141520 step (ArrayUnsafe contents start p) = do
1815− !x <- liftio $ peekAt p contents
1521+ !x <- liftio $ peekByteIndex p contents
18161522 return $ D.Yield x (ArrayUnsafe contents start (INDEX_PREV(p,a)))
18171523
18181524-- | Unfold an array into a stream in reverse order.
@@ -1843,7 +1549,7 @@ toListFB c n MutArray{..} = go arrStart
18431549 -- evaluated/written to before we peek at them.
18441550 -- XXX
18451551 let !x = unsafeInlineIO $ do
1846− r <- peekAt arrContents p
1552+ r <- peekByteIndex arrContents p
18471553 return r
18481554 in c x (go (PTR_NEXT(p,a)))
18491555-}
@@ -1860,21 +1566,21 @@ toList MutArray{..} = liftIO $ go arrStart
18601566
18611567 go p | assert (p <= arrEnd) (p == arrEnd) = return []
18621568 go p = do
1863− x <- peekAt p arrContents
1569+ x <- peekByteIndex p arrContents
18641570 (:) x <$> go (INDEX_NEXT(p,a))
18651571
1866−{-# INLINE_NORMAL toStreamWith #-}
1867−toStreamWith ::
1572+{-# INLINE_NORMAL toStreamDWith #-}
1573+toStreamDWith ::
18681574 forall m a. (Monad m, Unbox a)
18691575 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1870−toStreamWith liftio MutArray{..} = D.Stream step arrStart
1576+toStreamDWith liftio MutArray{..} = D.Stream step arrStart
18711577
18721578 where
18731579
18741580 {-# INLINE_LATE step #-}
18751581 step _ p | assert (p <= arrEnd) (p == arrEnd) = return D.Stop
18761582 step _ p = liftio $ do
1877− r <- peekAt p arrContents
1583+ r <- peekByteIndex p arrContents
18781584 return $ D.Yield r (INDEX_NEXT(p,a))
18791585
18801586-- | Convert a 'MutArray' into a stream.
@@ -1883,7 +1589,7 @@ toStreamWith liftio MutArray{..} = D.Stream step arrStart
18831589--
18841590{-# INLINE_NORMAL read #-}
18851591read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1886−read = toStreamWith liftIO
1592+read = toStreamDWith liftIO
18871593
18881594{-# INLINE toStreamKWith #-}
18891595toStreamKWith ::
@@ -1895,18 +1601,18 @@ toStreamKWith liftio MutArray{..} = go arrStart
18951601
18961602 go p | assert (p <= arrEnd) (p == arrEnd) = K.nil
18971603 | otherwise =
1898− let elemM = peekAt p arrContents
1604+ let elemM = peekByteIndex p arrContents
18991605 in liftio elemM `K.consM` go (INDEX_NEXT(p,a))
19001606
19011607{-# INLINE toStreamK #-}
19021608toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
19031609toStreamK = toStreamKWith liftIO
19041610
1905−{-# INLINE_NORMAL toStreamRevWith #-}
1906−toStreamRevWith ::
1611+{-# INLINE_NORMAL toStreamDRevWith #-}
1612+toStreamDRevWith ::
19071613 forall m a. (Monad m, Unbox a)
19081614 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1909−toStreamRevWith liftio MutArray{..} =
1615+toStreamDRevWith liftio MutArray{..} =
19101616 let p = INDEX_PREV(arrEnd,a)
19111617 in D.Stream step p
19121618
@@ -1915,7 +1621,7 @@ toStreamRevWith liftio MutArray{..} =
19151621 {-# INLINE_LATE step #-}
19161622 step _ p | p < arrStart = return D.Stop
19171623 step _ p = liftio $ do
1918− r <- peekAt p arrContents
1624+ r <- peekByteIndex p arrContents
19191625 return $ D.Yield r (INDEX_PREV(p,a))
19201626
19211627-- | Convert a 'MutArray' into a stream in reverse order.
@@ -1924,7 +1630,7 @@ toStreamRevWith liftio MutArray{..} =
19241630--
19251631{-# INLINE_NORMAL readRev #-}
19261632readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1927−readRev = toStreamRevWith liftIO
1633+readRev = toStreamDRevWith liftIO
19281634
19291635{-# INLINE toStreamKRevWith #-}
19301636toStreamKRevWith ::
@@ -1938,7 +1644,7 @@ toStreamKRevWith liftio MutArray {..} =
19381644
19391645 go p | p < arrStart = K.nil
19401646 | otherwise =
1941− let elemM = peekAt p arrContents
1647+ let elemM = peekByteIndex p arrContents
19421648 in liftio elemM `K.consM` go (INDEX_PREV(p,a))
19431649
19441650{-# INLINE toStreamKRev #-}
@@ -1973,7 +1679,7 @@ foldr f z arr = D.foldr f z $ read arr
19731679
19741680-- XXX Keep the bound intact to not lose any free space? Perf impact?
19751681
1976−-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
1682+-- | @writeAppendNUnsafe n arr@ appends up to @n@ input items to the supplied
19771683-- array.
19781684--
19791685-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1982,12 +1688,13 @@ foldr f z arr = D.foldr f z $ read arr
19821688-- Any free space left in the array after appending @n@ elements is lost.
19831689--
19841690-- /Internal/
1985−{-# INLINE_NORMAL unsafeAppendN #-}
1986−unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1691+{-# INLINE_NORMAL writeAppendNUnsafe #-}
1692+writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
19871693 Int
19881694 -> m (MutArray a)
19891695 -> Fold m a (MutArray a)
1990−unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
1696+writeAppendNUnsafe n action =
1697+ fmap fromArrayUnsafe $ FL.foldlM' step initial
19911698
19921699 where
19931700
@@ -2000,59 +1707,38 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
20001707 -- otherwise we lose that space.
20011708 arr1 <-
20021709 if free < needed
2003− then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
1710+ then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
20041711 else return arr
20051712 return $ toArrayUnsafe arr1
20061713
20071714 step (ArrayUnsafe contents start end) x = do
2008− liftIO $ pokeAt end contents x
1715+ liftIO $ pokeByteIndex end contents x
20091716 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
20101717
2011−{-# DEPRECATED writeAppendNUnsafe "Please use unsafeAppendN instead." #-}
2012−{-# INLINE writeAppendNUnsafe #-}
2013−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
2014− Int
2015− -> m (MutArray a)
2016− -> Fold m a (MutArray a)
2017−writeAppendNUnsafe = unsafeAppendN
2018−
20191718-- | Append @n@ elements to an existing array. Any free space left in the array
20201719-- after appending @n@ elements is lost.
20211720--
2022−-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
1721+-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
20231722--
2024−{-# INLINE_NORMAL appendN #-}
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)
2028−
2029−-- XXX Deprecate in major
2030−-- {-# DEPRECATED writeAppendN "Please use appendN instead." #-}
2031−{-# INLINE writeAppendN #-}
1723+{-# INLINE_NORMAL writeAppendN #-}
20321724writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
20331725 Int -> m (MutArray a) -> Fold m a (MutArray a)
2034−writeAppendN = appendN
1726+writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
20351727
2036−-- | @appendWith realloc action@ mutates the array generated by @action@ to
1728+-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
20371729-- append the input stream. If there is no reserved space available in the
20381730-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
20391731-- where @oldSize@ is the current size of the array in bytes.
20401732--
20411733-- Note that the returned array may be a mutated version of original array.
20421734--
2043−-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
1735+-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
20441736--
20451737-- /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)
2050−
2051−{-# DEPRECATED writeAppendWith "Please use appendWith instead." #-}
20521738{-# INLINE writeAppendWith #-}
20531739writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
20541740 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2055−writeAppendWith = appendWith
1741+writeAppendWith sizer = FL.foldlM' (snocWith sizer)
20561742
20571743-- | @append action@ mutates the array generated by @action@ to append the
20581744-- input stream. If there is no reserved space available in the array it is
@@ -2060,101 +1746,70 @@ writeAppendWith = appendWith
20601746--
20611747-- Note that the returned array may be a mutated version of original array.
20621748--
2063−-- >>> append = MutArray.appendWith (* 2)
1749+-- >>> writeAppend = MutArray.writeAppendWith (* 2)
20641750--
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)
2069−
2070−-- XXX Deprecate in major
2071−-- {-# DEPRECATED writeAppend "Please use append instead." #-}
20721751{-# INLINE writeAppend #-}
20731752writeAppend :: forall m a. (MonadIO m, Unbox a) =>
20741753 m (MutArray a) -> Fold m a (MutArray a)
2075−writeAppend = append
1754+writeAppend = writeAppendWith (* 2)
20761755
20771756-- XXX We can carry bound as well in the state to make sure we do not lose the
20781757-- remaining capacity. Need to check perf impact.
20791758--
2080−-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
2081−-- function as argument.
1759+-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
1760+-- as argument.
20821761--
2083−-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
1762+-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
20841763--
20851764-- /Pre-release/
2086−{-# INLINE_NORMAL unsafeCreateOfWith #-}
2087−unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
1765+{-# INLINE_NORMAL writeNWithUnsafe #-}
1766+writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
20881767 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2089−unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
1768+writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
20901769
20911770 where
20921771
20931772 initial = toArrayUnsafe <$> alloc (max n 0)
20941773
20951774 step (ArrayUnsafe contents start end) x = do
2096− liftIO $ pokeAt end contents x
1775+ liftIO $ pokeByteIndex end contents x
20971776 return
20981777 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
20991778
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
2105−
21061779{-# INLINE_NORMAL writeNUnsafeAs #-}
21071780writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
21081781 => PinnedState -> Int -> Fold m a (MutArray a)
2109−writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
1782+writeNUnsafeAs ps = writeNWithUnsafe (newAs ps)
21101783
2111−-- | Like 'createOf' but does not check the array bounds when writing. The fold
1784+-- | Like 'writeN' but does not check the array bounds when writing. The fold
21121785-- driver must not call the step function more than 'n' times otherwise it will
21131786-- corrupt the memory and crash. This function exists mainly because any
21141787-- conditional in the step function blocks fusion causing 10x performance
21151788-- slowdown.
21161789--
2117−-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
1790+-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.new
21181791--
2119−{-# INLINE_NORMAL unsafeCreateOf #-}
2120−unsafeCreateOf :: forall m a. (MonadIO m, Unbox a)
2121− => Int -> Fold m a (MutArray a)
2122−unsafeCreateOf = writeNUnsafeAs Unpinned
2123−
2124−{-# DEPRECATED writeNUnsafe "Please use unsafeCreateOf instead." #-}
2125−{-# INLINE writeNUnsafe #-}
1792+{-# INLINE_NORMAL writeNUnsafe #-}
21261793writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
21271794 => Int -> Fold m a (MutArray a)
2128−writeNUnsafe = unsafeCreateOf
1795+writeNUnsafe = writeNUnsafeAs Unpinned
21291796
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
2135−
2136−{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
2137−{-# INLINE pinnedWriteNUnsafe #-}
1797+-- | Like 'writeNUnsafe' but creates a pinned array.
1798+{-# INLINE_NORMAL pinnedWriteNUnsafe #-}
21381799pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
21391800 => Int -> Fold m a (MutArray a)
2140−pinnedWriteNUnsafe = unsafePinnedCreateOf
1801+pinnedWriteNUnsafe = writeNUnsafeAs Pinned
21411802
2142−-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
1803+-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
21431804-- allocated using the @alloc@ function.
21441805--
2145−-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
2146−-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
1806+-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
1807+-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
21471808--
2148−{-# INLINE_NORMAL createOfWith #-}
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)
2152−
2153−-- {-# DEPRECATED writeNWith "Please use createOfWith instead." #-}
2154−{-# INLINE writeNWith #-}
1809+{-# INLINE_NORMAL writeNWith #-}
21551810writeNWith :: forall m a. (MonadIO m, Unbox a)
21561811 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2157−writeNWith = createOfWith
1812+writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
21581813
21591814{-# INLINE_NORMAL writeNAs #-}
21601815writeNAs ::
@@ -2162,42 +1817,28 @@ writeNAs ::
21621817 => PinnedState
21631818 -> Int
21641819 -> Fold m a (MutArray a)
2165−writeNAs ps = createOfWith (newAs ps)
1820+writeNAs ps = writeNWith (newAs ps)
21661821
2167−-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
1822+-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
21681823-- 'MutArray'.
21691824--
2170−-- >>> createOf = MutArray.createOfWith MutArray.new
2171−-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
2172−-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
1825+-- >>> writeN = MutArray.writeNWith MutArray.new
1826+-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
1827+-- >>> writeN n = MutArray.writeAppendN n (MutArray.new n)
21731828--
2174−{-# INLINE_NORMAL createOf #-}
2175−createOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2176−createOf = writeNAs Unpinned
2177−
2178−-- XXX Deprecate in major
2179−-- {-# DEPRECATED writeN "Please use createOf instead." #-}
2180−{-# INLINE writeN #-}
1829+{-# INLINE_NORMAL writeN #-}
21811830writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2182−writeN = createOf
2183−
2184−-- | Like 'createOf' but creates a pinned array.
2185−{-# INLINE_NORMAL pinnedCreateOf #-}
2186−pinnedCreateOf ::
2187− forall m a. (MonadIO m, Unbox a)
2188− => Int
2189− -> Fold m a (MutArray a)
2190−pinnedCreateOf = writeNAs Pinned
1831+writeN = writeNAs Unpinned
21911832
2192−{-# DEPRECATED pinnedWriteN "Please use pinnedCreateOf instead." #-}
2193−{-# INLINE pinnedWriteN #-}
1833+-- | Like 'writeN' but creates a pinned array.
1834+{-# INLINE_NORMAL pinnedWriteN #-}
21941835pinnedWriteN ::
21951836 forall m a. (MonadIO m, Unbox a)
21961837 => Int
21971838 -> Fold m a (MutArray a)
2198−pinnedWriteN = pinnedCreateOf
1839+pinnedWriteN = writeNAs Pinned
21991840
2200−-- | Like unsafeCreateOfWith but writes the array in reverse order.
1841+-- | Like writeNWithUnsafe but writes the array in reverse order.
22011842--
22021843-- /Internal/
22031844{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -2214,11 +1855,11 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
22141855
22151856 step (ArrayUnsafe contents start end) x = do
22161857 let ptr = INDEX_PREV(start,a)
2217− liftIO $ pokeAt ptr contents x
1858+ liftIO $ pokeByteIndex ptr contents x
22181859 return
22191860 $ ArrayUnsafe contents ptr end
22201861
2221−-- | Like createOfWith but writes the array in reverse order.
1862+-- | Like writeNWith but writes the array in reverse order.
22221863--
22231864-- /Internal/
22241865{-# INLINE_NORMAL writeRevNWith #-}
@@ -2226,36 +1867,31 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
22261867 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
22271868writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
22281869
2229−-- | Like 'createOf' but writes the array in reverse order.
1870+-- | Like writeN but writes the array in reverse order.
22301871--
22311872-- /Pre-release/
2232−{-# INLINE_NORMAL revCreateOf #-}
2233−revCreateOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2234−revCreateOf = writeRevNWith new
2235−
2236−{-# DEPRECATED writeRevN "Please use revCreateOf instead." #-}
2237−{-# INLINE writeRevN #-}
1873+{-# INLINE_NORMAL writeRevN #-}
22381874writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2239−writeRevN = revCreateOf
1875+writeRevN = writeRevNWith new
22401876
22411877-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
22421878-- input stream to a 'MutArray' aligned to the given size.
22431879--
2244−-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
2245−-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
1880+-- >>> pinnedWriteNAligned align = MutArray.writeNWith (MutArray.pinnedNewAligned align)
1881+-- >>> pinnedWriteNAligned align n = MutArray.writeAppendN n (MutArray.pinnedNewAligned align n)
22461882--
22471883-- /Pre-release/
22481884--
22491885{-# INLINE_NORMAL pinnedWriteNAligned #-}
22501886pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
22511887 => Int -> Int -> Fold m a (MutArray a)
2252−pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
1888+pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
22531889
22541890-- XXX Buffer to a list instead?
22551891
22561892-- | Buffer a stream into a stream of arrays.
22571893--
2258−-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
1894+-- >>> writeChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
22591895--
22601896-- Breaking an array into an array stream can be useful to consume a large
22611897-- array sequentially such that memory of the array is released incrementatlly.
@@ -2264,43 +1900,37 @@ pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
22641900--
22651901-- /Unimplemented/
22661902--
2267−{-# INLINE_NORMAL buildChunks #-}
2268−buildChunks :: (MonadIO m, Unbox a) =>
2269− Int -> Fold m a (StreamK n (MutArray a))
2270−buildChunks n = FL.many (createOf n) FL.toStreamK
2271−
2272−{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273−{-# INLINE writeChunks #-}
1903+{-# INLINE_NORMAL writeChunks #-}
22741904writeChunks :: (MonadIO m, Unbox a) =>
22751905 Int -> Fold m a (StreamK n (MutArray a))
2276−writeChunks = buildChunks
1906+writeChunks n = FL.many (writeN n) FL.toStreamK
22771907
22781908{-# INLINE_NORMAL writeWithAs #-}
22791909writeWithAs :: forall m a. (MonadIO m, Unbox a)
22801910 => PinnedState -> Int -> Fold m a (MutArray a)
2281−-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
1911+-- writeWithAs ps n = FL.rmapM rightSize $ writeAppendWith (* 2) (newAs ps n)
22821912writeWithAs ps elemCount =
22831913 FL.rmapM extract $ FL.foldlM' step initial
22841914
22851915 where
22861916
22871917 initial = do
2288− when (elemCount < 0) $ error "createWith: elemCount is negative"
2289− newAs ps elemCount
1918+ when (elemCount < 0) $ error "writeWith: elemCount is negative"
1919+ liftIO $ newAs ps elemCount
22901920
22911921 step arr@(MutArray _ start end bound) x
22921922 | INDEX_NEXT(end,a) > bound = do
22931923 let oldSize = end - start
22941924 newSize = max (oldSize * 2) 1
2295− arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
1925+ arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
22961926 snocUnsafe arr1 x
22971927 step arr x = snocUnsafe arr x
22981928
22991929 extract = liftIO . rightSize
23001930
2301−-- XXX Compare createWith with fromStreamD which uses an array of streams
2302−-- implementation. We can write this using buildChunks above if that is faster.
2303−-- If createWith is faster then we should use that to implement
1931+-- XXX Compare writeWith with fromStreamD which uses an array of streams
1932+-- implementation. We can write this using writeChunks above if that is faster.
1933+-- If writeWith is faster then we should use that to implement
23041934-- fromStreamD.
23051935--
23061936-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2315,56 +1945,39 @@ writeWithAs ps elemCount =
23151945-- XXX check if GHC's memory allocator is efficient enough. We can try the C
23161946-- malloc to compare against.
23171947
2318−-- | @createWith minCount@ folds the whole input to a single array. The array
1948+-- | @writeWith minCount@ folds the whole input to a single array. The array
23191949-- starts at a size big enough to hold minCount elements, the size is doubled
23201950-- every time the array needs to be grown.
23211951--
23221952-- /Caution! Do not use this on infinite streams./
23231953--
2324−-- >>> f n = MutArray.appendWith (* 2) (MutArray.emptyOf n)
2325−-- >>> createWith n = Fold.rmapM MutArray.rightSize (f n)
2326−-- >>> createWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
1954+-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.new n)
1955+-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
1956+-- >>> writeWith n = Fold.rmapM MutArray.fromArrayStreamK (MutArray.writeChunks n)
23271957--
23281958-- /Pre-release/
2329−{-# INLINE_NORMAL createWith #-}
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
2334−
2335−{-# DEPRECATED writeWith "Please use createWith instead." #-}
2336−{-# INLINE writeWith #-}
1959+{-# INLINE_NORMAL writeWith #-}
23371960writeWith :: forall m a. (MonadIO m, Unbox a)
23381961 => Int -> Fold m a (MutArray a)
2339−writeWith = createWith
1962+-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (new n)
1963+writeWith = writeWithAs Unpinned
23401964
23411965-- | Fold the whole input to a single array.
23421966--
2343−-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
1967+-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
23441968-- rounded up to the element size.
23451969--
23461970-- /Caution! Do not use this on infinite streams./
23471971--
2348−{-# INLINE create #-}
2349−create :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2350−create = createWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2351−
2352−-- XXX Deprecate in major
2353−-- {-# DEPRECATED write "Please use create instead." #-}
23541972{-# INLINE write #-}
23551973write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2356−write = create
1974+write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
23571975
2358−-- | Like 'create' but creates a pinned array.
2359−{-# INLINE pinnedCreate #-}
2360−pinnedCreate :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2361−pinnedCreate =
2362− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2363−
2364−{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
1976+-- | Like 'write' but creates a pinned array.
23651977{-# INLINE pinnedWrite #-}
23661978pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2367−pinnedWrite = pinnedCreate
1979+pinnedWrite =
1980+ writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
23681981
23691982-------------------------------------------------------------------------------
23701983-- construct from streams, known size
@@ -2374,31 +1987,25 @@ pinnedWrite = pinnedCreate
23741987fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
23751988 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
23761989fromStreamDNAs ps limit str = do
2377− (arr :: MutArray a) <- newAs ps limit
1990+ (arr :: MutArray a) <- liftIO $ newAs ps limit
23781991 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
23791992 return $ arr {arrEnd = end}
23801993
23811994 where
23821995
23831996 fwrite arrContents ptr x = do
2384− liftIO $ pokeAt ptr arrContents x
1997+ liftIO $ pokeByteIndex ptr arrContents x
23851998 return $ INDEX_NEXT(ptr,a)
23861999
2387−-- | Use the 'createOf' fold instead.
2000+-- | Use the 'writeN' fold instead.
23882001--
2389−-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
2002+-- >>> fromStreamDN n = Stream.fold (MutArray.writeN n)
23902003--
2391−{-# INLINE_NORMAL fromStreamN #-}
2392−fromStreamN :: forall m a. (MonadIO m, Unbox a)
2393− => Int -> D.Stream m a -> m (MutArray a)
2394−-- fromStreamDN n = D.fold (createOf n)
2395−fromStreamN = fromStreamDNAs Unpinned
2396−
2397−{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398−{-# INLINE fromStreamDN #-}
2004+{-# INLINE_NORMAL fromStreamDN #-}
23992005fromStreamDN :: forall m a. (MonadIO m, Unbox a)
24002006 => Int -> D.Stream m a -> m (MutArray a)
2401−fromStreamDN = fromStreamN
2007+-- fromStreamDN n = D.fold (writeN n)
2008+fromStreamDN = fromStreamDNAs Unpinned
24022009
24032010-- | Create a 'MutArray' from the first N elements of a list. The array is
24042011-- allocated to size N, if the list terminates before N elements then the
@@ -2418,70 +2025,16 @@ pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
24182025-- /Pre-release/
24192026{-# INLINE fromListRevN #-}
24202027fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2421−fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
2422−
2423−-- | Convert a pure stream in Identity monad to a mutable array.
2424−{-# INLINABLE fromPureStreamN #-}
2425−fromPureStreamN :: (MonadIO m, Unbox a) =>
2426− Int -> Stream Identity a -> m (MutArray a)
2427−fromPureStreamN n xs =
2428− D.fold (createOf n) $ D.morphInner (return . runIdentity) xs
2028+fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
24292029
24302030-- | Convert a pure stream in Identity monad to a mutable array.
24312031{-# INLINABLE fromPureStream #-}
24322032fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
24332033fromPureStream xs =
2434− D.fold create $ D.morphInner (return . runIdentity) xs
2435−
2436−{-# INLINABLE fromPtrN #-}
2437−fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
2438−fromPtrN len addr = do
2439− -- memcpy is better than stream copy when the size is known.
2440− -- XXX We can implement a stream copy in a similar way by streaming Word64
2441− -- first and then remaining Word8.
2442− arr <- new len
2443− _ <- unsafeAsPtr arr
2444− (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2445− return (arr {arrEnd = len})
2446−
2447−{-# INLINABLE fromByteStr# #-}
2448−fromByteStr# :: MonadIO m => Addr# -> m (MutArray Word8)
2449−fromByteStr# addr = do
2450− -- It is better to count the size first and allocate exact space.
2451− -- Also, memcpy is better than stream copy when the size is known.
2452− -- C strlen compares 4 bytes at a time, so is better than the stream
2453− -- version. https://github.com/bminor/glibc/blob/master/string/strlen.c
2454− -- XXX We can possibly use a stream of Word64 to do the same.
2455− -- fromByteStr# addr = fromPureStream (D.fromByteStr# addr)
2456− len <- liftIO $ c_strlen (Ptr addr)
2457− let lenInt = fromIntegral len
2458− arr <- new lenInt
2459− _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2460− return (arr {arrEnd = lenInt})
2034+ liftIO $ D.fold write $ D.morphInner (return . runIdentity) xs
24612035
24622036-------------------------------------------------------------------------------
2463−-- convert a stream of arrays to a single array by reallocating and copying
2464−-------------------------------------------------------------------------------
2465−
2466−-- XXX Both of these implementations of splicing seem to perform equally well.
2467−-- We need to perform benchmarks over a range of sizes though.
2468−
2469−-- | Also see 'fromChunksK'.
2470−{-# INLINE fromChunksRealloced #-}
2471−fromChunksRealloced :: forall m a. (MonadIO m, Unbox a)
2472− => Stream m (MutArray a) -> m (MutArray a)
2473−fromChunksRealloced s = do
2474− res <- D.uncons s
2475− case res of
2476− Just (a, strm) -> do
2477− arr <- D.foldlM' spliceExp (pure a) strm
2478− -- Reallocation is exponential so there may be 50% empty space in
2479− -- worst case. One more reallocation to reclaim the space.
2480− rightSize arr
2481− Nothing -> pure nil
2482−
2483−-------------------------------------------------------------------------------
2484−-- convert a stream of arrays to a single array by buffering arrays first
2037+-- convert stream to a single array
24852038-------------------------------------------------------------------------------
24862039
24872040{-# INLINE arrayStreamKLength #-}
@@ -2491,72 +2044,34 @@ arrayStreamKLength as = K.foldl' (+) 0 (K.map length as)
24912044-- | Convert an array stream to an array. Note that this requires peak memory
24922045-- that is double the size of the array stream.
24932046--
2494−{-# INLINE fromChunkskAs #-}
2495−fromChunkskAs :: (Unbox a, MonadIO m) =>
2496− PinnedState -> StreamK m (MutArray a) -> m (MutArray a)
2497−fromChunkskAs ps as = do
2498− len <- arrayStreamKLength as
2499− arr <- newAs ps len
2500− -- XXX is StreamK fold faster or StreamD fold?
2501− K.foldlM' spliceUnsafe (pure arr) as
2502− -- fromStreamDN len $ D.unfoldMany reader $ D.fromStreamK as
2503−
2504−-- XXX Need to compare this with fromChunks and fromChunkList and keep the
2505−-- fastest or simplest one if all are equally fast.
2506−
2507−-- | Convert an array stream to an array. Note that this requires peak memory
2508−-- that is double the size of the array stream.
2509−--
2510−-- Also see 'fromChunksRealloced'.
2511−--
2512−{-# INLINE fromChunksK #-}
2513−fromChunksK :: (Unbox a, MonadIO m) =>
2514− StreamK m (MutArray a) -> m (MutArray a)
2515−fromChunksK = fromChunkskAs Unpinned
2516−
2517−{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
25182047{-# INLINE fromArrayStreamK #-}
25192048fromArrayStreamK :: (Unbox a, MonadIO m) =>
25202049 StreamK m (MutArray a) -> m (MutArray a)
2521−fromArrayStreamK = fromChunksK
2050+fromArrayStreamK as = do
2051+ len <- arrayStreamKLength as
2052+ fromStreamDN len $ D.unfoldMany reader $ D.fromStreamK as
25222053
25232054{-# INLINE fromStreamDAs #-}
25242055fromStreamDAs ::
25252056 (MonadIO m, Unbox a) => PinnedState -> D.Stream m a -> m (MutArray a)
2526−fromStreamDAs ps m =
2527− arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2057+fromStreamDAs ps m = arrayStreamKFromStreamDAs ps m >>= fromArrayStreamK
25282058
2529−-- | 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
2531−-- as efficient when the size is already known.
2532−--
2533−-- Note that if the input stream is too large memory allocation for the array
2534−-- may fail. When the stream size is not known, `chunksOf` followed by
2535−-- processing of indvidual arrays in the resulting stream should be preferred.
2536−--
2537−-- /Pre-release/
2538−{-# INLINE fromStream #-}
2539−fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2540−fromStream = fromStreamDAs Unpinned
2541−
2542−-- fromStream (Stream m) = P.fold create m
25432059-- CAUTION: a very large number (millions) of arrays can degrade performance
25442060-- due to GC overhead because we need to buffer the arrays before we flatten
25452061-- all the arrays.
25462062--
2547−-- XXX Compare if this is faster or "fold create".
2063+-- XXX Compare if this is faster or "fold write".
25482064--
25492065-- | We could take the approach of doubling the memory allocation on each
25502066-- overflow. This would result in more or less the same amount of copying as in
25512067-- the chunking approach. However, if we have to shrink in the end then it may
25522068-- result in an extra copy of the entire data.
25532069--
2554−-- >>> fromStreamD = StreamD.fold MutArray.create
2070+-- >>> fromStreamD = StreamD.fold MutArray.write
25552071--
25562072{-# INLINE fromStreamD #-}
2557−{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
25582073fromStreamD :: (MonadIO m, Unbox a) => D.Stream m a -> m (MutArray a)
2559−fromStreamD = fromStream
2074+fromStreamD = fromStreamDAs Unpinned
25602075
25612076-- | Create a 'MutArray' from a list. The list must be of finite size.
25622077--
@@ -2581,44 +2096,22 @@ fromListRev xs = fromListRevN (Prelude.length xs) xs
25812096-- Cloning
25822097-------------------------------------------------------------------------------
25832098
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.
2587−
25882099{-# INLINE cloneAs #-}
2589−cloneAs ::
2590− ( MonadIO m
2591−#ifdef DEVBUILD
2592− , Unbox a
2593−#endif
2594− )
2595− => PinnedState -> MutArray a -> m (MutArray a)
2100+cloneAs :: MonadIO m => PinnedState -> MutArray a -> m (MutArray a)
25962101cloneAs ps src =
2597− do
2102+ liftIO $ do
25982103 let startSrc = arrStart src
25992104 srcLen = arrEnd src - startSrc
2600− newArrContents <-
2601− Unboxed.cloneSliceUnsafeAs ps startSrc srcLen (arrContents src)
2105+ newArrContents <- Unboxed.newBytesAs ps srcLen
2106+ putSliceUnsafe (arrContents src) startSrc newArrContents 0 srcLen
26022107 return $ MutArray newArrContents 0 srcLen srcLen
26032108
26042109{-# INLINE clone #-}
2605−clone ::
2606− ( MonadIO m
2607−#ifdef DEVBUILD
2608− , Unbox a
2609−#endif
2610− )
2611− => MutArray a -> m (MutArray a)
2110+clone :: MonadIO m => MutArray a -> m (MutArray a)
26122111clone = cloneAs Unpinned
26132112
26142113{-# INLINE pinnedClone #-}
2615−pinnedClone ::
2616− ( MonadIO m
2617−#ifdef DEVBUILD
2618− , Unbox a
2619−#endif
2620− )
2621− => MutArray a -> m (MutArray a)
2114+pinnedClone :: MonadIO m => MutArray a -> m (MutArray a)
26222115pinnedClone = cloneAs Pinned
26232116
26242117-------------------------------------------------------------------------------
@@ -2633,16 +2126,17 @@ spliceCopy :: forall m a. MonadIO m =>
26332126 Unbox a =>
26342127#endif
26352128 MutArray a -> MutArray a -> m (MutArray a)
2636−spliceCopy arr1 arr2 = do
2129+spliceCopy arr1 arr2 = liftIO $ do
26372130 let start1 = arrStart arr1
26382131 start2 = arrStart arr2
26392132 len1 = arrEnd arr1 - start1
26402133 len2 = arrEnd arr2 - start2
2641− let len = len1 + len2
2134+ let newLen = len1 + len2
26422135 newArrContents <-
26432136 if Unboxed.isPinned (arrContents arr1)
2644− then liftIO $ Unboxed.pinnedNew len
2645− else liftIO $ Unboxed.new len
2137+ then Unboxed.pinnedNewByteArray newLen
2138+ else Unboxed.newByteArray newLen
2139+ let len = len1 + len2
26462140 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
26472141 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
26482142 return $ MutArray newArrContents 0 len len
@@ -2654,7 +2148,7 @@ spliceCopy arr1 arr2 = do
26542148spliceUnsafe :: MonadIO m =>
26552149 MutArray a -> MutArray a -> m (MutArray a)
26562150spliceUnsafe dst src =
2657− do
2151+ liftIO $ do
26582152 let startSrc = arrStart src
26592153 srcLen = arrEnd src - startSrc
26602154 endDst = arrEnd dst
@@ -2676,7 +2170,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
26762170 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
26772171spliceWith sizer dst@(MutArray _ start end bound) src = do
26782172{-
2679− let f = appendWith (`sizer` byteLength src) (return dst)
2173+ let f = writeAppendWith (`sizer` byteLength src) (return dst)
26802174 in D.fold f (toStreamD src)
26812175-}
26822176 assert (end <= bound) (return ())
@@ -2692,7 +2186,7 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
26922186 $ "splice: newSize is less than the total size "
26932187 ++ "of arrays being appended. Please check the "
26942188 ++ "sizer function passed."
2695− realloc newSizeInBytes dst
2189+ liftIO $ realloc newSizeInBytes dst
26962190 else return dst
26972191 spliceUnsafe dst1 src
26982192
@@ -2729,24 +2223,14 @@ spliceExp = spliceWith (\l1 l2 -> max (l1 * 2) (l1 + l2))
27292223-- Splitting
27302224-------------------------------------------------------------------------------
27312225
2732−-- | Generate a stream of array slices using a predicate. The array element
2733−-- matching the predicate is dropped.
2734−--
2735−-- /Pre-release/
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)
2742−
27432226-- | Drops the separator byte
27442227{-# INLINE breakOn #-}
27452228breakOn :: MonadIO m
27462229 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2747−breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2230+breakOn sep arr@MutArray{..} = asPtrUnsafe arr $ \p -> liftIO $ do
2231+ -- XXX Instead of using asPtrUnsafe (pinning memory) we can pass unlifted
2232+ -- Addr# to memchr and it should be safe (from ghc 8.4).
27482233 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2749− -- Need efficient stream based primitives that work on Word64.
27502234 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
27512235 let sepIndex = loc `minusPtr` p
27522236 return $
@@ -2767,41 +2251,32 @@ breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
27672251 }
27682252 )
27692253
2770−-- | Like 'splitAt' but does not check whether the index is valid.
2771−--
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)
2777− p = arrStart + off
2778− in ( MutArray
2779− { arrContents = arrContents
2780− , arrStart = arrStart
2781− , arrEnd = p
2782− , arrBound = p
2783− }
2784− , MutArray
2785− { arrContents = arrContents
2786− , arrStart = p
2787− , arrEnd = arrEnd
2788− , arrBound = arrBound
2789− }
2790− )
2791−
27922254-- | Create two slices of an array without copying the original array. The
27932255-- specified index @i@ is the first index of the second slice.
27942256--
2795−{-# INLINE splitAt #-}
27962257splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2797−splitAt i arr =
2258+splitAt i arr@MutArray{..} =
27982259 let maxIndex = length arr - 1
27992260 in if i < 0
28002261 then error "sliceAt: negative array index"
28012262 else if i > maxIndex
28022263 then error $ "sliceAt: specified array index " ++ show i
28032264 ++ " is beyond the maximum index " ++ show maxIndex
2804− else unsafeSplitAt i arr
2265+ else let off = i * SIZE_OF(a)
2266+ p = arrStart + off
2267+ in ( MutArray
2268+ { arrContents = arrContents
2269+ , arrStart = arrStart
2270+ , arrEnd = p
2271+ , arrBound = p
2272+ }
2273+ , MutArray
2274+ { arrContents = arrContents
2275+ , arrStart = p
2276+ , arrEnd = arrEnd
2277+ , arrBound = arrBound
2278+ }
2279+ )
28052280
28062281-------------------------------------------------------------------------------
28072282-- Casting
@@ -2851,13 +2326,9 @@ cast arr =
28512326-- guarantees that unsafe calls will be performed in the calling thread. Making
28522327-- it safe to pass heap-allocated objects to unsafe functions.
28532328
2854−-- XXX Should we just name it asPtr, the unsafety is implicit for any pointer
2329+-- Should we just name it asPtr, the unsafety is implicit for any pointer
28552330-- operations. And we are safe from Haskell perspective because we will be
28562331-- pinning the memory.
2857−--
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.
28612332
28622333-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
28632334-- array as a pointer to some operating system call or to a "safe" FFI call.
@@ -2875,377 +2346,48 @@ cast arr =
28752346--
28762347-- /Pre-release/
28772348--
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))
2883−
2884−{-# DEPRECATED asPtrUnsafe "Please use unsafePinnedAsPtr instead." #-}
28852349{-# INLINE asPtrUnsafe #-}
28862350asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2887−asPtrUnsafe = unsafePinnedAsPtr
2888−
2889−{-# INLINE unsafeAsPtr #-}
2890−unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2891−unsafeAsPtr arr f =
2892− Unboxed.unsafeAsPtr
2351+asPtrUnsafe arr f =
2352+ Unboxed.asPtrUnsafe
28932353 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
28942354
28952355-------------------------------------------------------------------------------
28962356-- Equality
28972357-------------------------------------------------------------------------------
28982358
2899−-- | Byte compare two arrays. Compare the length of the arrays. If the length
2900−-- is equal, compare the lexicographical ordering of two underlying byte arrays
2901−-- otherwise return the result of length comparison.
2902−--
2903−-- /Unsafe/: Note that the 'Unbox' instance of sum types with constructors of
2904−-- different sizes may leave some memory uninitialized which can make byte
2905−-- comparison unreliable.
2359+-- | Compare the length of the arrays. If the length is equal, compare the
2360+-- lexicographical ordering of two underlying byte arrays otherwise return the
2361+-- result of length comparison.
29062362--
29072363-- /Pre-release/
2908−{-# INLINE byteCmp #-}
2909−byteCmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2910−byteCmp arr1 arr2 = do
2911− let marr1 = getMutableByteArray# (arrContents arr1)
2912− marr2 = getMutableByteArray# (arrContents arr2)
2913− !(I# st1#) = arrStart arr1
2914− !(I# st2#) = arrStart arr2
2915− !(I# len#) = byteLength arr1
2916− case compare (byteLength arr1) (byteLength arr2) of
2917− EQ -> do
2918− r <- liftIO $ IO $ \s# ->
2919− let res =
2920− I#
2921− (compareByteArrays#
2922− (unsafeCoerce# marr1)
2923− st1#
2924− (unsafeCoerce# marr2)
2925− st2#
2926− len#)
2927− in (# s#, res #)
2928− return $ compare r 0
2929− x -> return x
2930−
29312364{-# INLINE cmp #-}
2932−{-# DEPRECATED cmp "Please use byteCmp instead." #-}
29332365cmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2934−cmp = byteCmp
2366+cmp arr1 arr2 =
2367+ liftIO
2368+ $ do
2369+ let marr1 = getMutableByteArray# (arrContents arr1)
2370+ marr2 = getMutableByteArray# (arrContents arr2)
2371+ !(I# st1#) = arrStart arr1
2372+ !(I# st2#) = arrStart arr2
2373+ !(I# len#) = byteLength arr1
2374+ case compare (byteLength arr1) (byteLength arr2) of
2375+ EQ -> do
2376+ r <- liftIO $ IO $ \s# ->
2377+ let res =
2378+ I#
2379+ (compareByteArrays#
2380+ (unsafeCoerce# marr1)
2381+ st1#
2382+ (unsafeCoerce# marr2)
2383+ st2#
2384+ len#)
2385+ in (# s#, res #)
2386+ return $ compare r 0
2387+ x -> return x
29352388
2936−-- | Byte equality of two arrays.
2937−--
2938−-- >>> byteEq arr1 arr2 = (==) EQ $ MArray.byteCmp arr1 arr2
2939−--
2940−-- /Unsafe/: See 'byteCmp'.
2941−{-# INLINE byteEq #-}
2942−byteEq :: MonadIO m => MutArray a -> MutArray a -> m Bool
2943−byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
2944−
2945−-------------------------------------------------------------------------------
2946−-- Compact
29472389-------------------------------------------------------------------------------
2948−
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.
2953−
2954−{-# INLINE_NORMAL pCompactLeAs #-}
2955−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
2959−
2960− where
2961−
2962− maxBytes = maxElems * SIZE_OF(a)
2963−
2964− functionName = "Streamly.Internal.Data.MutArray.pCompactLE"
2965−
2966− initial =
2967− return
2968− $ if maxElems <= 0
2969− then error
2970− $ functionName
2971− ++ ": the size of arrays ["
2972− ++ show maxElems ++ "] must be a natural number"
2973− else Parser.IPartial Nothing
2974−
2975− step Nothing arr =
2976− return
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
2986− else do
2987− buf1 <-
2988− if byteCapacity buf < maxBytes
2989− then liftIO $ reallocExplicitAs
2990− ps (SIZE_OF(a)) maxBytes buf
2991− else return buf
2992− buf2 <- spliceUnsafe buf1 arr
2993− return $ Parser.Partial 0 (Just buf2)
2994−
2995− extract Nothing = return $ Parser.Done 0 nil
2996− extract (Just buf) = return $ Parser.Done 0 buf
2997−
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.
3002−--
3003−-- @maxElems@ must be greater than 0.
3004−--
3005−-- Generates unpinned arrays irrespective of the pinning status of input
3006−-- arrays.
3007−--
3008−-- /Internal/
3009−{-# INLINE pCompactLE #-}
3010−pCompactLE ::
3011− forall m a. (MonadIO m, Unbox a)
3012− => Int -> Parser (MutArray a) m (MutArray a)
3013−pCompactLE = pCompactLeAs Unpinned
3014−
3015−-- | Pinned version of 'pCompactLE'.
3016−{-# INLINE pPinnedCompactLE #-}
3017−pPinnedCompactLE ::
3018− forall m a. (MonadIO m, Unbox a)
3019− => Int -> Parser (MutArray a) m (MutArray a)
3020−pPinnedCompactLE = pCompactLeAs Pinned
3021−
3022−data SpliceState s arr
3023− = SpliceInitial s
3024− | SpliceBuffering s arr
3025− | SpliceYielding arr (SpliceState s arr)
3026− | SpliceFinish
3027−
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.
3032−
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)
3038−
3039− where
3040−
3041− maxBytes = maxElems * SIZE_OF(a)
3042−
3043− functionName = "Streamly.Internal.Data.MutArray.rCompactLE"
3044−
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"
3051− r <- step gst st
3052− case r of
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
3060−
3061− -- XXX Split the last array to use the space more compactly.
3062− step' gst (SpliceBuffering st buf) = do
3063− r <- step gst st
3064− case r of
3065− D.Yield arr s -> do
3066− let len = byteLength buf + byteLength arr
3067− if len > maxBytes
3068− then return $
3069− D.Skip (SpliceYielding buf (SpliceBuffering s arr))
3070− else do
3071− buf1 <- if byteCapacity buf < maxBytes
3072− then liftIO $ reallocExplicitAs
3073− ps (SIZE_OF(a)) maxBytes buf
3074− else return 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)
3079−
3080− step' _ SpliceFinish = return D.Stop
3081−
3082− step' _ (SpliceYielding arr next) = return $ D.Yield arr next
3083−
3084−
3085−{-# INLINE_NORMAL fCompactGeAs #-}
3086−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
3090−
3091− where
3092−
3093− minBytes = minElems * SIZE_OF(a)
3094−
3095− functionName = "Streamly.Internal.Data.MutArray.fCompactGE"
3096−
3097− initial =
3098− return
3099− $ if minElems < 0
3100− then error
3101− $ functionName
3102− ++ ": the size of arrays ["
3103− ++ show minElems ++ "] must be a natural number"
3104− else FL.Partial Nothing
3105−
3106− step Nothing arr =
3107− return
3108− $ let len = byteLength arr
3109− in if len >= minBytes
3110− then FL.Done arr
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
3115− buf1 <-
3116− if byteCapacity buf < len
3117− then liftIO $ reallocExplicitAs
3118− ps (SIZE_OF(a)) (max minBytes len) buf
3119− else return buf
3120− buf2 <- spliceUnsafe buf1 arr
3121− if len >= minBytes
3122− then return $ FL.Done buf2
3123− else return $ FL.Partial (Just buf2)
3124−
3125− extract Nothing = return nil
3126− extract (Just buf) = return buf
3127−
3128−-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
3129−-- until the size becomes greater than or equal to @minElems@.
3130−--
3131−-- Generates unpinned arrays irrespective of the pinning status of input
3132−-- arrays.
3133−{-# INLINE fCompactGE #-}
3134−fCompactGE ::
3135− forall m a. (MonadIO m, Unbox a)
3136− => Int -> FL.Fold m (MutArray a) (MutArray a)
3137−fCompactGE = fCompactGeAs Unpinned
3138−
3139−-- | Pinned version of 'fCompactGE'.
3140−{-# INLINE fPinnedCompactGE #-}
3141−fPinnedCompactGE ::
3142− forall m a. (MonadIO m, Unbox a)
3143− => Int -> FL.Fold m (MutArray a) (MutArray a)
3144−fPinnedCompactGE = fCompactGeAs Pinned
3145−
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
3153−
3154− where
3155−
3156− minBytes = minElems * SIZE_OF(a)
3157−
3158− functionName = "Streamly.Internal.Data.MutArray.lCompactGE"
3159−
3160− initial = do
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"
3165−
3166− r <- initial1
3167− return $ first (Tuple' Nothing) r
3168−
3169− {-# INLINE runInner #-}
3170− runInner len acc buf =
3171− if len >= minBytes
3172− then do
3173− r <- step1 acc buf
3174− case r of
3175− FL.Done _ -> return $ FL.Done ()
3176− FL.Partial s -> do
3177− _ <- final1 s
3178− res <- initial1
3179− return $ first (Tuple' Nothing) res
3180− else return $ FL.Partial $ Tuple' (Just buf) acc
3181−
3182− step (Tuple' Nothing r1) arr =
3183− runInner (byteLength arr) r1 arr
3184−
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
3191− else return buf
3192− buf2 <- spliceUnsafe buf1 arr
3193− runInner len r1 buf2
3194−
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
3197− -- partial.
3198− --
3199− -- extract forces the pending buffer to be sent to the fold which is not
3200− -- what we want.
3201− extract _ = error "lCompactGE: not designed for scanning"
3202−
3203− final (Tuple' Nothing r1) = final1 r1
3204− final (Tuple' (Just buf) r1) = do
3205− r <- step1 r1 buf
3206− case r of
3207− FL.Partial rr -> final1 rr
3208− FL.Done _ -> return ()
3209−
3210−-- | Like 'compactGE' but for transforming folds instead of stream.
3211−--
3212−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3213−--
3214−-- Generates unpinned arrays irrespective of the pinning status of input
3215−-- arrays.
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
3220−
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
3226−
3227−-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3228−-- the size becomes greater than or equal to @n@.
3229−--
3230−-- >>> compactGE n = Stream.foldMany (MutArray.fCompactGE n)
3231−--
3232−{-# INLINE compactGE #-}
3233−compactGE ::
3234− (MonadIO m, Unbox a)
3235− => Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3236−compactGE n = D.foldMany (fCompactGE n)
3237−
3238−-- | 'compactEQ n' coalesces adajacent arrays in the input stream to
3239−-- arrays of exact size @n@.
3240−--
3241−-- /Unimplemented/
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)
3246−
3247−-------------------------------------------------------------------------------
3248−-- In-place mutation algorithms
2390+-- NFData
32492391-------------------------------------------------------------------------------
32502392
32512393-- | Strip elements which match with predicate from both ends.
@@ -3274,7 +2416,7 @@ strip eq arr@MutArray{..} = liftIO $ do
32742416 getStart cur = do
32752417 if cur < arrEnd
32762418 then do
3277− r <- peekAt cur arrContents
2419+ r <- peekByteIndex cur arrContents
32782420 if eq r
32792421 then getStart (INDEX_NEXT(cur,a))
32802422 else return cur
@@ -3284,7 +2426,7 @@ strip eq arr@MutArray{..} = liftIO $ do
32842426 if cur > low
32852427 then do
32862428 let prev = INDEX_PREV(cur,a)
3287− r <- peekAt prev arrContents
2429+ r <- peekByteIndex prev arrContents
32882430 if eq r
32892431 then getLast prev low
32902432 else return cur