@@ -28,80 +28,56 @@
29module Streamly.Internal.Data.MutArray.Type
29module Streamly.Internal.Data.MutArray.Type
31− -- ** Type
31+ -- * Type
32 -- $arrayNotes
32 -- $arrayNotes
33 MutArray (..)
33 MutArray (..)
34−
34+ , MutableByteArray
36− -- *** Pinned and Unpinned
39 , isPinned
37 , isPinned
41− -- ** Casting
39+ -- * Constructing and Writing
43− , castUnsafe -- XXX unsafeCast
48 -- ** Construction
40 -- ** Construction
52− -- | New arrays are always empty arrays with some reserve capacity to
53− -- extend the length without reallocating.
55− , newArrayWith -- emptyAlignedWith
57− , pinnedNewAligned -- XXX not required
58− -- , new -- uninitialized array of specified length
64− -- *** Slicing
43+ -- *** Uninitialized Arrays
65− -- | Get a subarray without copying
44+ , pinnedNew
66− , getSliceUnsafe -- XXX unsafeGetSlice
45+ , pinnedNewBytes
67− , getSlice
46+ , pinnedNewAligned
68− , splitAt -- XXX should be able to express using getSlice
47+ , new
69− , breakOn
48+ , newArrayWith
71− -- *** Stream Folds
50+ -- *** From streams
72 , ArrayUnsafe (..)
51 , ArrayUnsafe (..)
73− , unsafeCreateOfWith
52+ , writeNWithUnsafe
74− , unsafeCreateOf
53+ , writeNWith
75− , unsafePinnedCreateOf
54+ , writeNUnsafe
76− , pinnedCreateOf
55+ , pinnedWriteNUnsafe
77− , createOfWith
56+ , writeN
78− , createOf
57+ , pinnedWriteN
79− , revCreateOf
58+ , pinnedWriteNAligned
81− , pinnedCreate
60+ , writeWith
82− , createWith
61+ , write
83− , create
62+ , pinnedWrite
86− -- *** From containers
67+ -- ** From containers
87 , fromListN
68 , fromListN
88 , pinnedFromListN
69 , pinnedFromListN
89 , fromList
70 , fromList
90 , pinnedFromList
71 , pinnedFromList
91 , fromListRevN
72 , fromListRevN
92 , fromListRev
73 , fromListRev
93− , fromStreamN
74+ , fromStreamDN
94− , fromStream
75+ , fromStreamD
96 , fromPureStream
76 , fromPureStream
100− , fromChunksRealloced -- fromSmallChunks
102− -- ** Random writes
78+ -- * Random writes
103 , putIndex
79 , putIndex
104− , putIndexUnsafe -- XXX unsafePutIndex
80+ , putIndexUnsafe
105 , putIndices
81 , putIndices
106 -- , putFromThenTo
82 -- , putFromThenTo
107 -- , putFrom -- start writing at the given position
83 -- , putFrom -- start writing at the given position
@@ -109,71 +85,78 @@ module Streamly.Internal.Data.MutArray.Type
109 -- , putFromTo
85 -- , putFromTo
110 -- , putFromRev
86 -- , putFromRev
111 -- , putUptoRev
87 -- , putUptoRev
112− , modifyIndexUnsafe -- XXX unsafeModifyIndex
88+ , modifyIndexUnsafe
113 , modifyIndex
89 , modifyIndex
114 , modifyIndices
90 , modifyIndices
116 , swapIndices
92 , swapIndices
117 , unsafeSwapIndices
93 , unsafeSwapIndices
119− -- ** Reading
95+ -- * Growing and Shrinking
96+ -- Arrays grow only at the end, though it is possible to grow on both sides
97+ -- and therefore have a cons as well as snoc. But that will require two
98+ -- bounds in the array representation.
121− -- *** Indexing
100+ -- ** Appending elements
122− , getIndex
101+ , snocWith
123− , getIndexUnsafe -- XXX unsafeGetIndex
102+ , snoc
124− -- , getFromThenTo
103+ , snocLinear
125− , getIndexRev -- getRevIndex?
104+ , snocMay
126− , indexReader
105+ , snocUnsafe
129− -- *** To Streams
107+ -- ** Appending streams
108+ , writeAppendNUnsafe
113+ -- * Eliminating and Reading
131 , readRev
126 , readRev
134 , toStreamK
127 , toStreamK
136 , toStreamKRev
128 , toStreamKRev
139− -- *** To Containers
143 -- experimental
131 -- experimental
144 , producerWith
132 , producerWith
145 , producer
133 , producer
147− , reader
135+ -- ** Random reads
148− , readerRevWith
136+ , getIndex
149− , readerRev
137+ , getIndexUnsafe
151− -- ** Size and Capacity
139+ , getIndicesD
152− -- *** Size
140+ -- , getFromThenTo
153− , length
141+ , getIndexRev
161− -- *** Capacity Management
143+ -- * Memory Management
162 , blockSize
144 , blockSize
163 , arrayChunkBytes
145 , arrayChunkBytes
164 , allocBytesToElemCount
146 , allocBytesToElemCount
165− , realloc -- this is "resize"
147+ , realloc
167− , growExp
149+ , resizeExp
168 , rightSize
150 , rightSize
170− -- ** Folding
152+ -- * Size
171− , foldl'
153+ , length
172− , foldr
154+ , byteLength
173− , byteCmp
155+ -- , capacity
174− , byteEq
156+ , byteCapacity
176− -- ** In-place Mutation Algorithms
159+ -- * In-place Mutation Algorithms
178 , reverse
161 , reverse
179 , permute
162 , permute
@@ -183,121 +166,62 @@ module Streamly.Internal.Data.MutArray.Type
183 , mergeBy
166 , mergeBy
186− -- ** Growing and Shrinking
169+ -- * Casting
187− -- | Arrays grow only at the end, though it is possible to grow on both
170+ , cast
188− -- sides and therefore have a cons as well as snoc. But that will require
171+ , castUnsafe
189− -- both lower and upper bound in the array representation.
172+ , asBytes
191− -- *** Appending elements
196− , snocUnsafe -- XXX unsafeSnoc
198− -- *** Appending streams
204− -- *** Appending arrays
209− , spliceUnsafe -- XXX unsafeSplice
212− -- , appendSliceFrom
214− -- ** Serialization using Unbox
217− , pokeSkipUnsafe -- unsafePokeSkip
219− -- ** Deserialization using Unbox
175+ -- * Folding
220− , peekUncons
176+ , foldl'
221− , peekUnconsUnsafe -- unsafePeekUncons
177+ , foldr
222− , peekSkipUnsafe -- unsafePeekSkip
178+ , cmp
224− -- Arrays of arrays
180+ -- * Arrays of arrays
225 -- We can add dimensionality parameter to the array type to get
181 -- We can add dimensionality parameter to the array type to get
226 -- multidimensional arrays. Multidimensional arrays would just be a
182 -- multidimensional arrays. Multidimensional arrays would just be a
227 -- convenience wrapper on top of single dimensional arrays.
183 -- convenience wrapper on top of single dimensional arrays.
229− -- ** Streams of Arrays
185+ -- | Operations dealing with multiple arrays, streams of arrays or
230− -- *** Chunk
186+ -- multidimensional array representations.
231− -- | Group a stream into arrays.
187+
188+ -- ** Construct from streams
232 , chunksOf
189 , chunksOf
233 , pinnedChunksOf
190 , pinnedChunksOf
234− , buildChunks
191+ , writeChunks
236− -- *** Split
193+ -- ** Eliminate to streams
237− -- | Split an array into slices.
194+ , flattenArrays
198+ -- ** Construct from arrays
199+ -- get chunks without copying
239 -- , getSlicesFromLenN
202 -- , getSlicesFromLenN
240− , splitOn
203+ , splitAt -- XXX should be able to express using getSlice
241− -- , slicesOf
204+ , breakOn
243− -- *** Concat
206+ -- ** Cloning arrays
244− -- | Append the arrays in a stream to form a stream of elements.
207+ , clone
245− , concatWith
208+ , pinnedClone
247− , concat
210+ -- ** Appending arrays
248− , concatRev
211+ , spliceCopy
250− -- *** Compact
213+ , splice
251− -- | Append the arrays in a stream to form a stream of larger arrays.
214+ , spliceExp
252− , SpliceState (..)
215+ , spliceUnsafe
253− , pCompactLE
216+ -- , putSlice
254− , pPinnedCompactLE
217+ -- , appendSlice
255− , compactLeAs
218+ -- , appendSliceFrom
263− -- ** Utilities
220+ -- * Utilities
264 , roundUpToPower2
221 , roundUpToPower2
267 , c_memchr
224 , c_memchr
286− , writeAppendNUnsafe
293− , pinnedWriteNUnsafe
296− , pinnedWriteNAligned -- XXX not required
@@ -308,20 +232,19 @@ where
309import Control.Monad (when, void)
233import Control.Monad (when, void)
310import Control.Monad.IO.Class (MonadIO(..))
234import Control.Monad.IO.Class (MonadIO(..))
311−import Data.Bifunctor (first)
312import Data.Bits (shiftR, (.|.), (.&.))
235import Data.Bits (shiftR, (.|.), (.&.))
313import Data.Functor.Identity (Identity(..))
236import Data.Functor.Identity (Identity(..))
314import Data.Proxy (Proxy(..))
237import Data.Proxy (Proxy(..))
315import Data.Word (Word8)
238import Data.Word (Word8)
316import Foreign.C.Types (CSize(..), CInt(..))
239import Foreign.C.Types (CSize(..), CInt(..))
317import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
240import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
318−import Streamly.Internal.Data.MutByteArray.Type
241+import Streamly.Internal.Data.Unbox
319− ( MutByteArray(..)
242+ ( MutableByteArray(..)
320 , PinnedState(..)
244 , PinnedState(..)
321 , getMutableByteArray#
245 , getMutableByteArray#
322 , putSliceUnsafe
246 , putSliceUnsafe
324−import Streamly.Internal.Data.Unbox (Unbox(..))
325import GHC.Base
248import GHC.Base
327 , Int(..)
250 , Int(..)
@@ -329,31 +252,27 @@ import GHC.Base
329 , copyMutableByteArray#
252 , copyMutableByteArray#
331import GHC.Base (noinline)
254import GHC.Base (noinline)
332−import GHC.Exts (unsafeCoerce#, Addr#)
255+import GHC.Exts (unsafeCoerce#)
333import GHC.Ptr (Ptr(..))
256import GHC.Ptr (Ptr(..))
335import Streamly.Internal.Data.Fold.Type (Fold(..))
258import Streamly.Internal.Data.Fold.Type (Fold(..))
336import Streamly.Internal.Data.Producer.Type (Producer (..))
259import Streamly.Internal.Data.Producer.Type (Producer (..))
337import Streamly.Internal.Data.Stream.Type (Stream)
260import Streamly.Internal.Data.Stream.Type (Stream)
338−import Streamly.Internal.Data.Parser.Type (Parser (..))
339import Streamly.Internal.Data.StreamK.Type (StreamK)
261import Streamly.Internal.Data.StreamK.Type (StreamK)
340import Streamly.Internal.Data.SVar.Type (adaptState, defState)
262import Streamly.Internal.Data.SVar.Type (adaptState, defState)
341−import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
342import Streamly.Internal.Data.Unfold.Type (Unfold(..))
263import Streamly.Internal.Data.Unfold.Type (Unfold(..))
343import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
264import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
345import qualified Streamly.Internal.Data.Fold.Type as FL
266import 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
349import qualified Streamly.Internal.Data.Producer as Producer
267import qualified Streamly.Internal.Data.Producer as Producer
350import qualified Streamly.Internal.Data.Stream.Type as D
268import qualified Streamly.Internal.Data.Stream.Type as D
351import qualified Streamly.Internal.Data.Stream.Lift as D
269import qualified Streamly.Internal.Data.Stream.Lift as D
352import qualified Streamly.Internal.Data.StreamK.Type as K
270import qualified Streamly.Internal.Data.StreamK.Type as K
271+import qualified Streamly.Internal.Data.Unbox as Unboxed
353import qualified Prelude
272import qualified Prelude
355import Prelude hiding
274import Prelude hiding
356− (Foldable(..), concat, read, unlines, splitAt, reverse, truncate)
275+ (Foldable(..), read, unlines, splitAt, reverse, truncate)
358#include "DocTestDataMutArray.hs"
277#include "DocTestDataMutArray.hs"
@@ -361,7 +280,6 @@ import Prelude hiding
361-- Foreign helpers
280-- Foreign helpers
362-------------------------------------------------------------------------------
281-------------------------------------------------------------------------------
364−-- NOTE: Have to be "ccall unsafe" so that we can pass unpinned memory to these
365foreign import ccall unsafe "string.h memcpy" c_memcpy
283foreign import ccall unsafe "string.h memcpy" c_memcpy
366 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO (Ptr Word8)
284 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO (Ptr Word8)
@@ -371,9 +289,6 @@ foreign import ccall unsafe "string.h memchr" c_memchr
371foreign import ccall unsafe "string.h memcmp" c_memcmp
289foreign import ccall unsafe "string.h memcmp" c_memcmp
372 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO CInt
290 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO CInt
374−foreign import ccall unsafe "string.h strlen" c_strlen
375− :: Ptr Word8 -> IO CSize
377-- | Given an 'Unboxed' type (unused first arg) and a number of bytes, return
292-- | Given an 'Unboxed' type (unused first arg) and a number of bytes, return
378-- how many elements of that type will completely fit in those bytes.
293-- how many elements of that type will completely fit in those bytes.
@@ -428,7 +343,7 @@ data MutArray a =
428 -- The array is a range into arrContents. arrContents may be a superset of
343 -- The array is a range into arrContents. arrContents may be a superset of
429 -- the slice represented by the array. All offsets are in bytes.
344 -- the slice represented by the array. All offsets are in bytes.
431− { arrContents :: {-# UNPACK #-} !MutByteArray
346+ { arrContents :: {-# UNPACK #-} !MutableByteArray
432 , arrStart :: {-# UNPACK #-} !Int -- ^ index into arrContents
347 , arrStart :: {-# UNPACK #-} !Int -- ^ index into arrContents
433 , arrEnd :: {-# UNPACK #-} !Int -- ^ index into arrContents
348 , arrEnd :: {-# UNPACK #-} !Int -- ^ index into arrContents
434 -- Represents the first invalid index of
349 -- Represents the first invalid index of
@@ -440,8 +355,8 @@ data MutArray a =
440-- Pinning & Unpinning
355-- Pinning & Unpinning
441-------------------------------------------------------------------------------
356-------------------------------------------------------------------------------
443−-- | Return a copy of the array in pinned memory if unpinned, else return the
358+-- | Copy the 'MutArray' to pinned memory if unpinned, else do nothing. The
444−-- original array.
359+-- overhead is a copy if the input array is unpinned.
445{-# INLINE pin #-}
360{-# INLINE pin #-}
446pin :: MutArray a -> IO (MutArray a)
361pin :: MutArray a -> IO (MutArray a)
447pin arr@MutArray{..} =
362pin arr@MutArray{..} =
@@ -449,8 +364,8 @@ pin arr@MutArray{..} =
449 then pure arr
364 then pure arr
450 else pinnedClone arr
365 else pinnedClone arr
452−-- | Return a copy of the array in unpinned memory if pinned, else return the
367+-- | Copy the 'MutArray' to unpinned memory if pinned, else do nothing. The
453−-- original array.
368+-- overhead is a copy if the input array is pinned.
454{-# INLINE unpin #-}
369{-# INLINE unpin #-}
455unpin :: MutArray a -> IO (MutArray a)
370unpin :: MutArray a -> IO (MutArray a)
456unpin arr@MutArray{..} =
371unpin arr@MutArray{..} =
@@ -458,7 +373,6 @@ unpin arr@MutArray{..} =
458 then clone arr
373 then clone arr
459 else pure arr
374 else pure arr
461−-- | Return 'True' if the array is allocated in pinned memory.
462{-# INLINE isPinned #-}
376{-# INLINE isPinned #-}
463isPinned :: MutArray a -> Bool
377isPinned :: MutArray a -> Bool
464isPinned MutArray{..} = Unboxed.isPinned arrContents
378isPinned MutArray{..} = Unboxed.isPinned arrContents
@@ -479,8 +393,6 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
479-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
393-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
480-- allocatePinned in GHC source.
394-- allocatePinned in GHC source.
482−-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
484-- | @newArrayWith allocator alignment count@ allocates a new array of zero
396-- | @newArrayWith allocator alignment count@ allocates a new array of zero
485-- length and with a capacity to hold @count@ elements, using @allocator
397-- length and with a capacity to hold @count@ elements, using @allocator
486-- size alignment@ as the memory allocator function.
398-- size alignment@ as the memory allocator function.
@@ -493,7 +405,7 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
493-- /Pre-release/
405-- /Pre-release/
494{-# INLINE newArrayWith #-}
406{-# INLINE newArrayWith #-}
495newArrayWith :: forall m a. (MonadIO m, Unbox a)
407newArrayWith :: forall m a. (MonadIO m, Unbox a)
496− => (Int -> Int -> m MutByteArray) -> Int -> Int -> m (MutArray a)
408+ => (Int -> Int -> m MutableByteArray) -> Int -> Int -> m (MutArray a)
497newArrayWith alloc alignSize count = do
409newArrayWith alloc alignSize count = do
498 let size = max (count * SIZE_OF(a)) 0
410 let size = max (count * SIZE_OF(a)) 0
499 contents <- alloc size alignSize
411 contents <- alloc size alignSize
@@ -504,25 +416,12 @@ newArrayWith alloc alignSize count = do
504 , arrBound = size
416 , arrBound = size
507−-- For arrays "nil" sounds a bit odd. empty is better. The only problem with
508−-- empty is that it is also used by the Alternative type class. But assuming we
509−-- will mostly import the Array module qualified this should be fine.
511−-- | Create an empty array.
517−empty = MutArray Unboxed.empty 0 0 0
519−{-# DEPRECATED nil "Please use empty instead." #-}
521#ifdef DEVBUILD
420#ifdef DEVBUILD
522 Unbox a =>
421 Unbox a =>
524 MutArray a
423 MutArray a
525−nil = empty
424+nil = MutArray Unboxed.nil 0 0 0
527{-# INLINE newBytesAs #-}
426{-# INLINE newBytesAs #-}
528newBytesAs :: MonadIO m =>
427newBytesAs :: MonadIO m =>
@@ -539,13 +438,12 @@ newBytesAs ps bytes = do
539 , arrBound = bytes
438 , arrBound = bytes
542−-- | Allocates a pinned empty array that with a reserved capacity of bytes.
441+-- | Allocates a pinned empty array that can hold 'count' items. The memory of
543−-- The memory of the array is uninitialized and the allocation is aligned as
442+-- the array is uninitialized and the allocation is aligned as per the
544−-- per the 'Unboxed' instance of the type.
443+-- 'Unboxed' instance of the type.
546-- /Pre-release/
445-- /Pre-release/
547{-# INLINE pinnedNewBytes #-}
446{-# INLINE pinnedNewBytes #-}
548−{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
549pinnedNewBytes :: MonadIO m =>
447pinnedNewBytes :: MonadIO m =>
550#ifdef DEVBUILD
448#ifdef DEVBUILD
551 Unbox a =>
449 Unbox a =>
@@ -570,31 +468,21 @@ newAs ps =
570 (error "new: alignment is not used in unpinned arrays.")
468 (error "new: alignment is not used in unpinned arrays.")
572-- XXX can unaligned allocation be more efficient when alignment is not needed?
470-- XXX can unaligned allocation be more efficient when alignment is not needed?
574−-- | Allocates a pinned array of zero length but growable to the specified
472+-- | Allocates an empty pinned array that can hold 'count' items. The memory of
575−-- capacity without reallocation.
473+-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
576−{-# INLINE pinnedEmptyOf #-}
474+-- instance of the type.
577−pinnedEmptyOf :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
475+--
578−pinnedEmptyOf = newAs Pinned
580−-- XXX Deprecate in major
581−-- {-# DEPRECATED pinnedNew "Please use pinnedEmptyOf instead." #-}
582{-# INLINE pinnedNew #-}
476{-# INLINE pinnedNew #-}
583pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
477pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
584−pinnedNew = pinnedEmptyOf
478+pinnedNew = newAs Pinned
586−-- | Allocates an unpinned array of zero length but growable to the specified
480+-- | Allocates an empty unpinned array that can hold 'count' items. The memory
587−-- capacity without reallocation.
481+-- of the array is uninitialized.
589−{-# INLINE emptyOf #-}
590−emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591−emptyOf = newAs Unpinned
593−-- XXX Deprecate in major
594−-- {-# DEPRECATED new "Please use emptyOf instead." #-}
595{-# INLINE new #-}
483{-# INLINE new #-}
596new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
484new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
597−new = emptyOf
485+new = newAs Unpinned
599-------------------------------------------------------------------------------
487-------------------------------------------------------------------------------
600-- Random writes
488-- Random writes
@@ -610,7 +498,7 @@ putIndexUnsafe :: forall m a. (MonadIO m, Unbox a)
610putIndexUnsafe i MutArray{..} x = do
498putIndexUnsafe i MutArray{..} x = do
611 let index = INDEX_OF(arrStart, i, a)
499 let index = INDEX_OF(arrStart, i, a)
612 assert (i >= 0 && INDEX_VALID(index, arrEnd, a)) (return ())
500 assert (i >= 0 && INDEX_VALID(index, arrEnd, a)) (return ())
613− liftIO $ pokeAt index arrContents x
501+ liftIO $ pokeByteIndex index arrContents x
615invalidIndex :: String -> Int -> a
503invalidIndex :: String -> Int -> a
616invalidIndex label i =
504invalidIndex label i =
@@ -628,7 +516,7 @@ putIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m ()
628putIndex i MutArray{..} x = do
516putIndex i MutArray{..} x = do
629 let index = INDEX_OF(arrStart,i,a)
517 let index = INDEX_OF(arrStart,i,a)
630 if i >= 0 && INDEX_VALID(index,arrEnd,a)
518 if i >= 0 && INDEX_VALID(index,arrEnd,a)
631− then liftIO $ pokeAt index arrContents x
519+ then liftIO $ pokeByteIndex index arrContents x
632 else invalidIndex "putIndex" i
520 else invalidIndex "putIndex" i
634-- | Write an input stream of (index, value) pairs to an array. Throws an
522-- | Write an input stream of (index, value) pairs to an array. Throws an
@@ -642,7 +530,7 @@ putIndices arr = FL.foldlM' step (return ())
645− step () (i, x) = putIndex i arr x
533+ step () (i, x) = liftIO (putIndex i arr x)
647-- | Modify a given index of an array using a modifier function.
535-- | Modify a given index of an array using a modifier function.
@@ -654,9 +542,9 @@ modifyIndexUnsafe :: forall m a b. (MonadIO m, Unbox a) =>
654modifyIndexUnsafe i MutArray{..} f = liftIO $ do
542modifyIndexUnsafe i MutArray{..} f = liftIO $ do
655 let index = INDEX_OF(arrStart,i,a)
543 let index = INDEX_OF(arrStart,i,a)
656 assert (i >= 0 && INDEX_NEXT(index,a) <= arrEnd) (return ())
544 assert (i >= 0 && INDEX_NEXT(index,a) <= arrEnd) (return ())
657− r <- peekAt index arrContents
545+ r <- peekByteIndex index arrContents
658 let (x, res) = f r
546 let (x, res) = f r
659− pokeAt index arrContents x
547+ pokeByteIndex index arrContents x
660 return res
548 return res
662-- | Modify a given index of an array using a modifier function.
550-- | Modify a given index of an array using a modifier function.
@@ -668,9 +556,9 @@ modifyIndex i MutArray{..} f = do
668 let index = INDEX_OF(arrStart,i,a)
556 let index = INDEX_OF(arrStart,i,a)
669 if i >= 0 && INDEX_VALID(index,arrEnd,a)
557 if i >= 0 && INDEX_VALID(index,arrEnd,a)
670 then liftIO $ do
558 then liftIO $ do
671− r <- peekAt index arrContents
559+ r <- peekByteIndex index arrContents
672 let (x, res) = f r
560 let (x, res) = f r
673− pokeAt index arrContents x
561+ pokeByteIndex index arrContents x
674 return res
562 return res
675 else invalidIndex "modifyIndex" i
563 else invalidIndex "modifyIndex" i
@@ -704,8 +592,8 @@ modify MutArray{..} f = liftIO $
706 when (INDEX_VALID(i,arrEnd,a)) $ do
594 when (INDEX_VALID(i,arrEnd,a)) $ do
707− r <- peekAt i arrContents
595+ r <- peekByteIndex i arrContents
708− pokeAt i arrContents (f r)
596+ pokeByteIndex i arrContents (f r)
709 go (INDEX_NEXT(i,a))
597 go (INDEX_NEXT(i,a))
711-- XXX We could specify the number of bytes to swap instead of Proxy. Need
599-- XXX We could specify the number of bytes to swap instead of Proxy. Need
@@ -714,15 +602,15 @@ modify MutArray{..} f = liftIO $
714swapArrayByteIndices ::
602swapArrayByteIndices ::
715 forall a. Unbox a
603 forall a. Unbox a
716 => Proxy a
604 => Proxy a
717− -> MutByteArray
605+ -> MutableByteArray
721swapArrayByteIndices _ arrContents i1 i2 = do
609swapArrayByteIndices _ arrContents i1 i2 = do
722− r1 <- peekAt i1 arrContents
610+ r1 <- peekByteIndex i1 arrContents
723− r2 <- peekAt i2 arrContents
611+ r2 <- peekByteIndex i2 arrContents
724− pokeAt i1 arrContents (r2 :: a)
612+ pokeByteIndex i1 arrContents (r2 :: a)
725− pokeAt i2 arrContents (r1 :: a)
613+ pokeByteIndex i2 arrContents (r1 :: a)
727-- | Swap the elements at two indices without validating the indices.
615-- | Swap the elements at two indices without validating the indices.
@@ -838,23 +726,26 @@ arrayChunkBytes = 1024
838roundDownTo :: Int -> Int -> Int
726roundDownTo :: Int -> Int -> Int
839roundDownTo elemSize size = size - (size `mod` elemSize)
727roundDownTo elemSize size = size - (size `mod` elemSize)
729+-- XXX See if resizing can be implemented by reading the old array as a stream
730+-- and then using writeN to the new array.
841-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
732-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
842-- Since this is not inlined Unboxed consrraint leads to dictionary passing
733-- Since this is not inlined Unboxed consrraint leads to dictionary passing
843-- which complicates some inspection tests.
734-- which complicates some inspection tests.
845−{-# NOINLINE reallocExplicitAs #-}
736+{-# NOINLINE reallocExplicit #-}
846−reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
737+reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
847−reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
738+reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
848 assertM(arrEnd <= arrBound)
739 assertM(arrEnd <= arrBound)
850 -- Allocate new array
741 -- Allocate new array
851 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
742 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
852 contents <-
743 contents <-
853− if ps == Pinned
744+ if Unboxed.isPinned arrContents
854− then Unboxed.pinnedNew newCapMaxInBytes
745+ then Unboxed.pinnedNewBytes newCapMaxInBytes
855− else Unboxed.new newCapMaxInBytes
746+ else Unboxed.newBytes newCapMaxInBytes
856− let !(MutByteArray mbarrFrom#) = arrContents
747+ let !(MutableByteArray mbarrFrom#) = arrContents
857− !(MutByteArray mbarrTo#) = contents
748+ !(MutableByteArray mbarrTo#) = contents
859 -- Copy old data
750 -- Copy old data
860 let oldStart = arrStart
751 let oldStart = arrStart
@@ -875,10 +766,6 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
875 , arrBound = newCapInBytes
766 , arrBound = newCapInBytes
878−-- XXX Should these be called reallocBytes etc?
879−-- XXX We may also need reallocAs to allocate as pinned/unpinned explicitly. In
880−-- fact clone/pinnedClone can be implemented using reallocAs.
882-- | @realloc newCapacity array@ reallocates the array to the specified
769-- | @realloc newCapacity array@ reallocates the array to the specified
883-- capacity in bytes.
770-- capacity in bytes.
@@ -890,12 +777,7 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
890-- If the original array is pinned, the newly allocated array is also pinned.
777-- If the original array is pinned, the newly allocated array is also pinned.
891{-# INLINABLE realloc #-}
778{-# INLINABLE realloc #-}
892realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
779realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
898− in liftIO $ reallocExplicitAs ps (SIZE_OF(a)) bytes arr
780+realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
900-- | @reallocWith label capSizer minIncrBytes array@. The label is used
782-- | @reallocWith label capSizer minIncrBytes array@. The label is used
901-- in error messages and the capSizer is used to determine the capacity of the
783-- in error messages and the capSizer is used to determine the capacity of the
@@ -918,14 +800,14 @@ reallocWith label capSizer minIncrBytes arr = do
920 badSize newSize =
802 badSize newSize =
921− Prelude.concat
803+ concat
923 , ": new array size (in bytes) is less than required size "
805 , ": new array size (in bytes) is less than required size "
924 , show newSize
806 , show newSize
925 , ". Please check the sizing function passed."
807 , ". Please check the sizing function passed."
928−-- | @grow newCapacity array@ changes the total capacity of the array so that
810+-- | @resize newCapacity array@ changes the total capacity of the array so that
929-- it is enough to hold the specified number of elements. Nothing is done if
811-- it is enough to hold the specified number of elements. Nothing is done if
930-- the specified capacity is less than the length of the array.
812-- the specified capacity is less than the length of the array.
@@ -933,46 +815,34 @@ reallocWith label capSizer minIncrBytes arr = do
933-- the block size (4K).
815-- the block size (4K).
935-- /Pre-release/
817-- /Pre-release/
936−{-# INLINE grow #-}
818+{-# INLINE resize #-}
937−grow :: forall m a. (MonadIO m, Unbox a) =>
819+resize :: forall m a. (MonadIO m, Unbox a) =>
938 Int -> MutArray a -> m (MutArray a)
820 Int -> MutArray a -> m (MutArray a)
939−grow nElems arr@MutArray{..} = do
821+resize nElems arr@MutArray{..} = do
940 let req = SIZE_OF(a) * nElems
822 let req = SIZE_OF(a) * nElems
941− cap = arrBound - arrStart
823+ len = arrEnd - arrStart
942− if req < cap
824+ if req < len
943 then return arr
825 then return arr
944 else realloc req arr
826 else realloc req arr
946−{-# DEPRECATED resize "Please use grow instead." #-}
947−{-# INLINE resize #-}
948−resize :: forall m a. (MonadIO m, Unbox a) =>
949− Int -> MutArray a -> m (MutArray a)
952−-- | Like 'grow' but if the requested byte capacity is more than
828+-- | Like 'resize' but if the byte capacity is more than 'largeObjectThreshold'
953−-- 'largeObjectThreshold' then it is rounded up to the closest power of 2.
829+-- then it is rounded up to the closest power of 2.
955-- /Pre-release/
831-- /Pre-release/
956−{-# INLINE growExp #-}
832+{-# INLINE resizeExp #-}
957−growExp :: forall m a. (MonadIO m, Unbox a) =>
833+resizeExp :: forall m a. (MonadIO m, Unbox a) =>
958 Int -> MutArray a -> m (MutArray a)
834 Int -> MutArray a -> m (MutArray a)
959−growExp nElems arr@MutArray{..} = do
835+resizeExp nElems arr@MutArray{..} = do
960 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
836 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
962 if req > largeObjectThreshold
838 if req > largeObjectThreshold
963 then roundUpToPower2 req
839 then roundUpToPower2 req
965− cap = arrBound - arrStart
841+ len = arrEnd - arrStart
966− if req1 < cap
842+ if req1 < len
967 then return arr
843 then return arr
968 else realloc req1 arr
844 else realloc req1 arr
970−{-# DEPRECATED resizeExp "Please use growExp instead." #-}
971−{-# INLINE resizeExp #-}
972−resizeExp :: forall m a. (MonadIO m, Unbox a) =>
973− Int -> MutArray a -> m (MutArray a)
976-- | Resize the allocated memory to drop any reserved free space at the end of
846-- | Resize the allocated memory to drop any reserved free space at the end of
977-- the array and reallocate it to reduce wastage.
847-- the array and reallocate it to reduce wastage.
@@ -1017,7 +887,7 @@ rightSize arr@MutArray{..} = do
1017snocNewEnd :: (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m (MutArray a)
887snocNewEnd :: (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m (MutArray a)
1018snocNewEnd newEnd arr@MutArray{..} x = liftIO $ do
888snocNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1019 assert (newEnd <= arrBound) (return ())
889 assert (newEnd <= arrBound) (return ())
1020− pokeAt arrEnd arrContents x
890+ pokeByteIndex arrEnd arrContents x
1021 return $ arr {arrEnd = newEnd}
891 return $ arr {arrEnd = newEnd}
1023-- | Really really unsafe, appends the element into the first array, may
893-- | Really really unsafe, appends the element into the first array, may
@@ -1037,7 +907,7 @@ snocUnsafe arr@MutArray{..} = snocNewEnd (INDEX_NEXT(arrEnd,a)) arr
1037{-# INLINE snocMay #-}
907{-# INLINE snocMay #-}
1038snocMay :: forall m a. (MonadIO m, Unbox a) =>
908snocMay :: forall m a. (MonadIO m, Unbox a) =>
1039 MutArray a -> a -> m (Maybe (MutArray a))
909 MutArray a -> a -> m (Maybe (MutArray a))
1040−snocMay arr@MutArray{..} x = do
910+snocMay arr@MutArray{..} x = liftIO $ do
1041 let newEnd = INDEX_NEXT(arrEnd,a)
911 let newEnd = INDEX_NEXT(arrEnd,a)
1042 if newEnd <= arrBound
912 if newEnd <= arrBound
1043 then Just <$> snocNewEnd newEnd arr x
913 then Just <$> snocNewEnd newEnd arr x
@@ -1051,7 +921,7 @@ snocWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1052 -> m (MutArray a)
922 -> m (MutArray a)
1053snocWithRealloc sizer arr x = do
923snocWithRealloc sizer arr x = do
1054− arr1 <- reallocWith "snocWith" sizer (SIZE_OF(a)) arr
924+ arr1 <- liftIO $ reallocWith "snocWith" sizer (SIZE_OF(a)) arr
1055 snocUnsafe arr1 x
925 snocUnsafe arr1 x
1057-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
927-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
@@ -1073,7 +943,7 @@ snocWith :: forall m a. (MonadIO m, Unbox a) =>
1073 -> MutArray a
943 -> MutArray a
1075 -> m (MutArray a)
945 -> m (MutArray a)
1076−snocWith allocSize arr x = do
946+snocWith allocSize arr x = liftIO $ do
1077 let newEnd = INDEX_NEXT(arrEnd arr,a)
947 let newEnd = INDEX_NEXT(arrEnd arr,a)
1078 if newEnd <= arrBound arr
948 if newEnd <= arrBound arr
1079 then snocNewEnd newEnd arr x
949 then snocNewEnd newEnd arr x
@@ -1117,126 +987,6 @@ snoc = snocWith f
1117 then oldSize * 2
987 then oldSize * 2
1118 else roundUpToPower2 oldSize * 2
988 else roundUpToPower2 oldSize * 2
1120−-------------------------------------------------------------------------------
1121−-- Serialization/Deserialization
1122−-------------------------------------------------------------------------------
1124−{-# INLINE pokeNewEnd #-}
1125−pokeNewEnd :: (MonadIO m, Unbox a) =>
1126− Int -> MutArray Word8 -> a -> m (MutArray Word8)
1127−pokeNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1128− assert (newEnd <= arrBound) (return ())
1129− liftIO $ pokeAt arrEnd arrContents x
1130− return $ arr {arrEnd = newEnd}
1132−-- | Really really unsafe, unboxes a Haskell type and appends the resulting
1133−-- bytes to the byte array, may cause silent data corruption or if you are
1134−-- lucky a segfault if the array does not have enough space to append the
1138−{-# INLINE pokeAppendUnsafe #-}
1139−pokeAppendUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1140− MutArray Word8 -> a -> m (MutArray Word8)
1141−pokeAppendUnsafe arr@MutArray{..} = pokeNewEnd (arrEnd + SIZE_OF(a)) arr
1143−-- | Skip the specified number of bytes in the array. The data in the skipped
1144−-- region remains uninitialzed.
1145−{-# INLINE pokeSkipUnsafe #-}
1146−pokeSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1147−pokeSkipUnsafe n arr@MutArray{..} = do
1148− let newEnd = arrEnd + n
1149− in assert (newEnd <= arrBound) (arr {arrEnd = newEnd})
1151−-- | Like 'pokeAppend' but does not grow the array when pre-allocated array
1152−-- capacity becomes full.
1155−{-# INLINE pokeAppendMay #-}
1156−pokeAppendMay :: forall m a. (MonadIO m, Unbox a) =>
1157− MutArray Word8 -> a -> m (Maybe (MutArray Word8))
1158−pokeAppendMay arr@MutArray{..} x = liftIO $ do
1159− let newEnd = arrEnd + SIZE_OF(a)
1160− if newEnd <= arrBound
1161− then Just <$> pokeNewEnd newEnd arr x
1162− else return Nothing
1164−{-# NOINLINE pokeWithRealloc #-}
1165−pokeWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1169− -> m (MutArray Word8)
1170−pokeWithRealloc sizer arr x = do
1171− arr1 <- liftIO $ reallocWith "pokeWithRealloc" sizer (SIZE_OF(a)) arr
1172− pokeAppendUnsafe arr1 x
1174−{-# INLINE pokeAppendWith #-}
1175−pokeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1179− -> m (MutArray Word8)
1180−pokeAppendWith allocSize arr x = liftIO $ do
1181− let newEnd = arrEnd arr + SIZE_OF(a)
1182− if newEnd <= arrBound arr
1183− then pokeNewEnd newEnd arr x
1184− else pokeWithRealloc allocSize arr x
1186−-- | Unbox a Haskell type and append the resulting bytes to a mutable byte
1187−-- array. The array is grown exponentially when more space is needed.
1191−-- >>> pokeAppend arr x = MutArray.castUnsafe <$> MutArray.snoc (MutArray.castUnsafe arr) x
1193−{-# INLINE pokeAppend #-}
1194−pokeAppend :: forall m a. (MonadIO m, Unbox a) =>
1195− MutArray Word8 -> a -> m (MutArray Word8)
1196−pokeAppend = pokeAppendWith f
1201− if isPower2 oldSize
1203− else roundUpToPower2 oldSize * 2
1205−-- | Really really unsafe, create a Haskell value from an unboxed byte array,
1206−-- does not check if the array is big enough, may return garbage or if you are
1207−-- lucky may cause a segfault.
1210−{-# INLINE peekUnconsUnsafe #-}
1211−peekUnconsUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1212− MutArray Word8 -> m (a, MutArray Word8)
1213−peekUnconsUnsafe MutArray{..} = do
1214− let start1 = arrStart + SIZE_OF(a)
1215− assert (start1 <= arrEnd) (return ())
1217− r <- peekAt arrStart arrContents
1218− return (r, MutArray arrContents start1 arrEnd arrBound)
1220−-- | Discard the specified number of bytes in the array.
1221−{-# INLINE peekSkipUnsafe #-}
1222−peekSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1223−peekSkipUnsafe n MutArray{..} =
1224− let start1 = arrStart + n
1225− in assert (start1 <= arrEnd) (MutArray arrContents start1 arrEnd arrBound)
1227−-- | Create a Haskell value from its unboxed representation from the head of a
1228−-- byte array, return the value and the remaining array.
1229−{-# INLINE peekUncons #-}
1230−peekUncons :: forall m a. (MonadIO m, Unbox a) =>
1231− MutArray Word8 -> m (Maybe a, MutArray Word8)
1232−peekUncons arr@MutArray{..} = do
1233− let start1 = arrStart + SIZE_OF(a)
1235− then return (Nothing, arr)
1237− r <- peekAt arrStart arrContents
1238− return (Just r, MutArray arrContents start1 arrEnd arrBound)
1240-------------------------------------------------------------------------------
990-------------------------------------------------------------------------------
1241-- Random reads
991-- Random reads
1242-------------------------------------------------------------------------------
992-------------------------------------------------------------------------------
@@ -1251,7 +1001,7 @@ getIndexUnsafe :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
1251getIndexUnsafe i MutArray{..} = do
1001getIndexUnsafe i MutArray{..} = do
1252 let index = INDEX_OF(arrStart,i,a)
1002 let index = INDEX_OF(arrStart,i,a)
1253 assert (i >= 0 && INDEX_VALID(index,arrEnd,a)) (return ())
1003 assert (i >= 0 && INDEX_VALID(index,arrEnd,a)) (return ())
1254− liftIO $ peekAt index arrContents
1004+ liftIO $ peekByteIndex index arrContents
1256-- | /O(1)/ Lookup the element at the given index. Index starts from 0.
1006-- | /O(1)/ Lookup the element at the given index. Index starts from 0.
@@ -1260,7 +1010,7 @@ getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (Maybe a)
1260getIndex i MutArray{..} = do
1010getIndex i MutArray{..} = do
1261 let index = INDEX_OF(arrStart,i,a)
1011 let index = INDEX_OF(arrStart,i,a)
1262 if i >= 0 && INDEX_VALID(index,arrEnd,a)
1012 if i >= 0 && INDEX_VALID(index,arrEnd,a)
1263− then liftIO $ Just <$> peekAt index arrContents
1013+ then liftIO $ Just <$> peekByteIndex index arrContents
1264 else return Nothing
1014 else return Nothing
1266-- | /O(1)/ Lookup the element at the given index from the end of the array.
1016-- | /O(1)/ Lookup the element at the given index from the end of the array.
@@ -1273,16 +1023,21 @@ getIndexRev :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
1273getIndexRev i MutArray{..} = do
1023getIndexRev i MutArray{..} = do
1274 let index = RINDEX_OF(arrEnd,i,a)
1024 let index = RINDEX_OF(arrEnd,i,a)
1275 if i >= 0 && index >= arrStart
1025 if i >= 0 && index >= arrStart
1276− then liftIO $ peekAt index arrContents
1026+ then liftIO $ peekByteIndex index arrContents
1277 else invalidIndex "getIndexRev" i
1027 else invalidIndex "getIndexRev" i
1279data GetIndicesState contents start end st =
1029data GetIndicesState contents start end st =
1280 GetIndicesState contents start end st
1030 GetIndicesState contents start end st
1282−{-# INLINE indexReaderWith #-}
1032+-- | Given an unfold that generates array indices, read the elements on those
1033+-- indices from the supplied MutArray. An error is thrown if an index is out of
1037+{-# INLINE getIndicesD #-}
1283−indexReaderWith :: (Monad m, Unbox a) =>
1038+getIndicesD :: (Monad m, Unbox a) =>
1284 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1039 (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
1040+getIndicesD liftio (D.Stream stepi sti) = Unfold step inject
@@ -1301,26 +1056,9 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
1301 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
1056 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
1302 D.Stop -> return D.Stop
1057 D.Stop -> return D.Stop
1304−{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1305−{-# INLINE getIndicesWith #-}
1306−getIndicesWith :: (Monad m, Unbox a) =>
1307− (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1308−getIndicesWith = indexReaderWith
1310−-- | Given an unfold that generates array indices, read the elements on those
1311−-- indices from the supplied MutArray. An error is thrown if an index is out of
1315−{-# INLINE indexReader #-}
1316−indexReader :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1317−indexReader = indexReaderWith liftIO
1319−-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1320−{-# DEPRECATED getIndices "Please use indexReader instead." #-}
1321{-# INLINE getIndices #-}
1059{-# INLINE getIndices #-}
1322getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1060getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1323−getIndices = indexReader
1061+getIndices = getIndicesD liftIO
1325-------------------------------------------------------------------------------
1063-------------------------------------------------------------------------------
1326-- Subarrays
1064-- Subarrays
@@ -1425,7 +1163,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
1426 -- Invariant low < high on entry, and on return as well
1164 -- Invariant low < high on entry, and on return as well
1427 moveHigh low high = do
1165 moveHigh low high = do
1428− h <- peekAt high arrContents
1166+ h <- peekByteIndex high arrContents
1431 -- Correctly classified, continue the loop
1169 -- Correctly classified, continue the loop
@@ -1445,7 +1183,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
1445 -- low <= high
1183 -- low <= high
1446 -- Both low and high are valid locations within the array
1184 -- Both low and high are valid locations within the array
1447 go low high = do
1185 go low high = do
1448− l <- peekAt low arrContents
1186+ l <- peekByteIndex low arrContents
1451 -- low is wrongly classified
1189 -- low is wrongly classified
@@ -1456,8 +1194,8 @@ partitionBy f arr@MutArray{..} = liftIO $ do
1456 case r of
1194 case r of
1457 Nothing -> return low
1195 Nothing -> return low
1458 Just (high1, h) -> do -- low < high1
1196 Just (high1, h) -> do -- low < high1
1459− pokeAt low arrContents h
1197+ pokeByteIndex low arrContents h
1460− pokeAt high1 arrContents l
1198+ pokeByteIndex high1 arrContents l
1461 let low1 = INDEX_NEXT(low,a)
1199 let low1 = INDEX_NEXT(low,a)
1462 high2 = INDEX_PREV(high1,a)
1200 high2 = INDEX_PREV(high1,a)
1463 if low1 <= high2
1201 if low1 <= high2
@@ -1591,7 +1329,7 @@ chunksOfAs ps n (D.Stream step state) =
1591 r <- step (adaptState gst) st
1329 r <- step (adaptState gst) st
1592 case r of
1330 case r of
1593 D.Yield x s -> do
1331 D.Yield x s -> do
1594− liftIO $ pokeAt end contents x
1332+ liftIO $ pokeByteIndex end contents x
1595 let end1 = INDEX_NEXT(end,a)
1333 let end1 = INDEX_NEXT(end,a)
1596 return $
1334 return $
1597 if end1 >= bound
1335 if end1 >= bound
@@ -1615,7 +1353,7 @@ chunksOfAs ps n (D.Stream step state) =
1616-- Same as the following but may be more efficient:
1354-- Same as the following but may be more efficient:
1618−-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
1356+-- >>> chunksOf n = Stream.foldMany (MutArray.writeN n)
1620-- /Pre-release/
1358-- /Pre-release/
1621{-# INLINE_NORMAL chunksOf #-}
1359{-# INLINE_NORMAL chunksOf #-}
@@ -1624,29 +1362,17 @@ chunksOf :: forall m a. (MonadIO m, Unbox a)
1624-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1362-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1625-- benchmark. It seems it has difficulty producing optimized code when
1363-- benchmark. It seems it has difficulty producing optimized code when
1626-- converting to StreamK. Investigate GHC optimizations.
1364-- converting to StreamK. Investigate GHC optimizations.
1627−-- chunksOf n = D.foldMany (createOf n)
1365+-- chunksOf n = D.foldMany (writeN n)
1628chunksOf = chunksOfAs Unpinned
1366chunksOf = chunksOfAs Unpinned
1630-- | Like 'chunksOf' but creates pinned arrays.
1368-- | Like 'chunksOf' but creates pinned arrays.
1631{-# INLINE_NORMAL pinnedChunksOf #-}
1369{-# INLINE_NORMAL pinnedChunksOf #-}
1632pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1370pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1633 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1371 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1634−-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
1372+-- pinnedChunksOf n = D.foldMany (pinnedWriteN n)
1635pinnedChunksOf = chunksOfAs Pinned
1373pinnedChunksOf = chunksOfAs Pinned
1637−-- | When we are buffering a stream of unknown size into an array we do not
1375+-- XXX This should take a PinnedState
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.
1642−-- We can incorporate this in chunksOfAs if the additional size parameter does
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
1650-- XXX buffer to a list instead?
1376-- XXX buffer to a list instead?
1651-- | Buffer the stream into arrays in memory.
1377-- | Buffer the stream into arrays in memory.
1652{-# INLINE arrayStreamKFromStreamDAs #-}
1378{-# INLINE arrayStreamKFromStreamDAs #-}
@@ -1664,10 +1390,16 @@ data FlattenState s contents a =
1664 OuterLoop s
1390 OuterLoop s
1665 | InnerLoop s contents !Int !Int
1391 | InnerLoop s contents !Int !Int
1393+-- | Use the "reader" unfold instead.
1395+-- @flattenArrays = unfoldMany reader@
1397+-- We can try this if there are any fusion issues in the unfold.
1667−{-# INLINE_NORMAL concatWith #-}
1399+{-# INLINE_NORMAL flattenArrays #-}
1668−concatWith :: forall m a. (Monad m, Unbox a)
1400+flattenArrays :: forall m a. (MonadIO m, Unbox a)
1669− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1401+ => D.Stream m (MutArray a) -> D.Stream m a
1670−concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1402+flattenArrays (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1684,30 +1416,19 @@ concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1684 return $ D.Skip $ OuterLoop st
1416 return $ D.Skip $ OuterLoop st
1686 step' _ (InnerLoop st contents p end) = do
1418 step' _ (InnerLoop st contents p end) = do
1687− x <- liftio $ peekAt p contents
1419+ x <- liftIO $ peekByteIndex p contents
1688 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1420 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1690−-- | Use the "reader" unfold instead.
1422+-- | Use the "readerRev" unfold instead.
1692−-- @concat = unfoldMany reader@
1424+-- @flattenArrays = unfoldMany readerRev@
1694-- We can try this if there are any fusion issues in the unfold.
1426-- We can try this if there are any fusion issues in the unfold.
1696−{-# INLINE_NORMAL concat #-}
1428+{-# INLINE_NORMAL flattenArraysRev #-}
1697−concat :: forall m a. (MonadIO m, Unbox a)
1698− => D.Stream m (MutArray a) -> D.Stream m a
1699−concat = concatWith liftIO
1701−{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1702−{-# INLINE flattenArrays #-}
1703−flattenArrays :: forall m a. (MonadIO m, Unbox a)
1429+flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1704 => D.Stream m (MutArray a) -> D.Stream m a
1430 => D.Stream m (MutArray a) -> D.Stream m a
1705−flattenArrays = concat
1707−{-# INLINE_NORMAL concatRevWith #-}
1708−concatRevWith :: forall m a. (Monad m, Unbox a)
1709− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1710−concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1431+flattenArraysRev (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1725,33 +1446,16 @@ concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1725 return $ D.Skip $ OuterLoop st
1446 return $ D.Skip $ OuterLoop st
1727 step' _ (InnerLoop st contents p start) = do
1448 step' _ (InnerLoop st contents p start) = do
1728− x <- liftio $ peekAt p contents
1449+ x <- liftIO $ peekByteIndex p contents
1729 let cur = INDEX_PREV(p,a)
1450 let cur = INDEX_PREV(p,a)
1730 return $ D.Yield x (InnerLoop st contents cur start)
1451 return $ D.Yield x (InnerLoop st contents cur start)
1732−-- | Use the "readerRev" unfold instead.
1734−-- @concat = unfoldMany readerRev@
1736−-- We can try this if there are any fusion issues in the unfold.
1738−{-# INLINE_NORMAL concatRev #-}
1739−concatRev :: forall m a. (MonadIO m, Unbox a)
1740− => D.Stream m (MutArray a) -> D.Stream m a
1741−concatRev = concatRevWith liftIO
1743−{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
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
1749-------------------------------------------------------------------------------
1453-------------------------------------------------------------------------------
1750-- Unfolds
1454-- Unfolds
1751-------------------------------------------------------------------------------
1455-------------------------------------------------------------------------------
1753data ArrayUnsafe a = ArrayUnsafe
1457data ArrayUnsafe a = ArrayUnsafe
1754− {-# UNPACK #-} !MutByteArray -- contents
1458+ {-# UNPACK #-} !MutableByteArray -- contents
1755 {-# UNPACK #-} !Int -- index 1
1459 {-# UNPACK #-} !Int -- index 1
1756 {-# UNPACK #-} !Int -- index 2
1460 {-# UNPACK #-} !Int -- index 2
@@ -1781,7 +1485,7 @@ producerWith liftio = Producer step (return . toArrayUnsafe) extract
1781 -- few actions for correctness and execution order sanity. We want
1485 -- few actions for correctness and execution order sanity. We want
1782 -- the peek to occur right here and not lazily at some later point
1486 -- the peek to occur right here and not lazily at some later point
1783 -- because we want the peek to be ordered with respect to the touch.
1487 -- because we want the peek to be ordered with respect to the touch.
1784− !x <- liftio $ peekAt cur contents
1488+ !x <- liftio $ peekByteIndex cur contents
1785 return $ D.Yield x (ArrayUnsafe contents (INDEX_NEXT(cur,a)) end)
1489 return $ D.Yield x (ArrayUnsafe contents (INDEX_NEXT(cur,a)) end)
1787 extract = return . fromArrayUnsafe
1491 extract = return . fromArrayUnsafe
@@ -1812,7 +1516,7 @@ readerRevWith liftio = Unfold step inject
1812 {-# INLINE_LATE step #-}
1516 {-# INLINE_LATE step #-}
1813 step (ArrayUnsafe _ start p) | p < start = return D.Stop
1517 step (ArrayUnsafe _ start p) | p < start = return D.Stop
1814 step (ArrayUnsafe contents start p) = do
1518 step (ArrayUnsafe contents start p) = do
1815− !x <- liftio $ peekAt p contents
1519+ !x <- liftio $ peekByteIndex p contents
1816 return $ D.Yield x (ArrayUnsafe contents start (INDEX_PREV(p,a)))
1520 return $ D.Yield x (ArrayUnsafe contents start (INDEX_PREV(p,a)))
1818-- | Unfold an array into a stream in reverse order.
1522-- | Unfold an array into a stream in reverse order.
@@ -1843,7 +1547,7 @@ toListFB c n MutArray{..} = go arrStart
1843 -- evaluated/written to before we peek at them.
1547 -- evaluated/written to before we peek at them.
1845 let !x = unsafeInlineIO $ do
1549 let !x = unsafeInlineIO $ do
1846− r <- peekAt arrContents p
1550+ r <- peekByteIndex arrContents p
1847 return r
1551 return r
1848 in c x (go (PTR_NEXT(p,a)))
1552 in c x (go (PTR_NEXT(p,a)))
@@ -1860,21 +1564,21 @@ toList MutArray{..} = liftIO $ go arrStart
1861 go p | assert (p <= arrEnd) (p == arrEnd) = return []
1565 go p | assert (p <= arrEnd) (p == arrEnd) = return []
1862 go p = do
1566 go p = do
1863− x <- peekAt p arrContents
1567+ x <- peekByteIndex p arrContents
1864 (:) x <$> go (INDEX_NEXT(p,a))
1568 (:) x <$> go (INDEX_NEXT(p,a))
1866−{-# INLINE_NORMAL toStreamWith #-}
1570+{-# INLINE_NORMAL toStreamDWith #-}
1867−toStreamWith ::
1571+toStreamDWith ::
1868 forall m a. (Monad m, Unbox a)
1572 forall m a. (Monad m, Unbox a)
1869 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1573 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1870−toStreamWith liftio MutArray{..} = D.Stream step arrStart
1574+toStreamDWith liftio MutArray{..} = D.Stream step arrStart
1874 {-# INLINE_LATE step #-}
1578 {-# INLINE_LATE step #-}
1875 step _ p | assert (p <= arrEnd) (p == arrEnd) = return D.Stop
1579 step _ p | assert (p <= arrEnd) (p == arrEnd) = return D.Stop
1876 step _ p = liftio $ do
1580 step _ p = liftio $ do
1877− r <- peekAt p arrContents
1581+ r <- peekByteIndex p arrContents
1878 return $ D.Yield r (INDEX_NEXT(p,a))
1582 return $ D.Yield r (INDEX_NEXT(p,a))
1880-- | Convert a 'MutArray' into a stream.
1584-- | Convert a 'MutArray' into a stream.
@@ -1883,7 +1587,7 @@ toStreamWith liftio MutArray{..} = D.Stream step arrStart
1884{-# INLINE_NORMAL read #-}
1588{-# INLINE_NORMAL read #-}
1885read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1589read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1886−read = toStreamWith liftIO
1590+read = toStreamDWith liftIO
1888{-# INLINE toStreamKWith #-}
1592{-# INLINE toStreamKWith #-}
1889toStreamKWith ::
1593toStreamKWith ::
@@ -1895,18 +1599,18 @@ toStreamKWith liftio MutArray{..} = go arrStart
1896 go p | assert (p <= arrEnd) (p == arrEnd) = K.nil
1600 go p | assert (p <= arrEnd) (p == arrEnd) = K.nil
1897 | otherwise =
1601 | otherwise =
1898− let elemM = peekAt p arrContents
1602+ let elemM = peekByteIndex p arrContents
1899 in liftio elemM `K.consM` go (INDEX_NEXT(p,a))
1603 in liftio elemM `K.consM` go (INDEX_NEXT(p,a))
1901{-# INLINE toStreamK #-}
1605{-# INLINE toStreamK #-}
1902toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1606toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
1903toStreamK = toStreamKWith liftIO
1607toStreamK = toStreamKWith liftIO
1905−{-# INLINE_NORMAL toStreamRevWith #-}
1609+{-# INLINE_NORMAL toStreamDRevWith #-}
1906−toStreamRevWith ::
1610+toStreamDRevWith ::
1907 forall m a. (Monad m, Unbox a)
1611 forall m a. (Monad m, Unbox a)
1908 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1612 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1909−toStreamRevWith liftio MutArray{..} =
1613+toStreamDRevWith liftio MutArray{..} =
1910 let p = INDEX_PREV(arrEnd,a)
1614 let p = INDEX_PREV(arrEnd,a)
1911 in D.Stream step p
1615 in D.Stream step p
@@ -1915,7 +1619,7 @@ toStreamRevWith liftio MutArray{..} =
1915 {-# INLINE_LATE step #-}
1619 {-# INLINE_LATE step #-}
1916 step _ p | p < arrStart = return D.Stop
1620 step _ p | p < arrStart = return D.Stop
1917 step _ p = liftio $ do
1621 step _ p = liftio $ do
1918− r <- peekAt p arrContents
1622+ r <- peekByteIndex p arrContents
1919 return $ D.Yield r (INDEX_PREV(p,a))
1623 return $ D.Yield r (INDEX_PREV(p,a))
1921-- | Convert a 'MutArray' into a stream in reverse order.
1625-- | Convert a 'MutArray' into a stream in reverse order.
@@ -1924,7 +1628,7 @@ toStreamRevWith liftio MutArray{..} =
1925{-# INLINE_NORMAL readRev #-}
1629{-# INLINE_NORMAL readRev #-}
1926readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1630readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1927−readRev = toStreamRevWith liftIO
1631+readRev = toStreamDRevWith liftIO
1929{-# INLINE toStreamKRevWith #-}
1633{-# INLINE toStreamKRevWith #-}
1930toStreamKRevWith ::
1634toStreamKRevWith ::
@@ -1938,7 +1642,7 @@ toStreamKRevWith liftio MutArray {..} =
1939 go p | p < arrStart = K.nil
1643 go p | p < arrStart = K.nil
1940 | otherwise =
1644 | otherwise =
1941− let elemM = peekAt p arrContents
1645+ let elemM = peekByteIndex p arrContents
1942 in liftio elemM `K.consM` go (INDEX_PREV(p,a))
1646 in liftio elemM `K.consM` go (INDEX_PREV(p,a))
1944{-# INLINE toStreamKRev #-}
1648{-# INLINE toStreamKRev #-}
@@ -1973,7 +1677,7 @@ foldr f z arr = D.foldr f z $ read arr
1974-- XXX Keep the bound intact to not lose any free space? Perf impact?
1678-- XXX Keep the bound intact to not lose any free space? Perf impact?
1976−-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
1680+-- | @writeAppendNUnsafe n arr@ appends up to @n@ input items to the supplied
1977-- array.
1681-- array.
1979-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
1683-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1982,12 +1686,13 @@ foldr f z arr = D.foldr f z $ read arr
1982-- Any free space left in the array after appending @n@ elements is lost.
1686-- Any free space left in the array after appending @n@ elements is lost.
1984-- /Internal/
1688-- /Internal/
1985−{-# INLINE_NORMAL unsafeAppendN #-}
1689+{-# INLINE_NORMAL writeAppendNUnsafe #-}
1986−unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1690+writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1988 -> m (MutArray a)
1692 -> m (MutArray a)
1989 -> Fold m a (MutArray a)
1693 -> Fold m a (MutArray a)
1694+writeAppendNUnsafe n action =
1990−unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
1695+ fmap fromArrayUnsafe $ FL.foldlM' step initial
@@ -2000,59 +1705,38 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
2000 -- otherwise we lose that space.
1705 -- otherwise we lose that space.
2002 if free < needed
1707 if free < needed
2003− then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
1708+ then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
2004 else return arr
1709 else return arr
2005 return $ toArrayUnsafe arr1
1710 return $ toArrayUnsafe arr1
2007 step (ArrayUnsafe contents start end) x = do
1712 step (ArrayUnsafe contents start end) x = do
2008− liftIO $ pokeAt end contents x
1713+ liftIO $ pokeByteIndex end contents x
2009 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
1714 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2011−{-# DEPRECATED writeAppendNUnsafe "Please use unsafeAppendN instead." #-}
2012−{-# INLINE writeAppendNUnsafe #-}
2013−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
2016− -> Fold m a (MutArray a)
2017−writeAppendNUnsafe = unsafeAppendN
2019-- | Append @n@ elements to an existing array. Any free space left in the array
1716-- | Append @n@ elements to an existing array. Any free space left in the array
2020-- after appending @n@ elements is lost.
1717-- after appending @n@ elements is lost.
2022−-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
1719+-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
2024−{-# INLINE_NORMAL appendN #-}
1721+{-# INLINE_NORMAL writeAppendN #-}
2025−appendN :: forall m a. (MonadIO m, Unbox a) =>
2026− Int -> m (MutArray a) -> Fold m a (MutArray a)
2027−appendN n initial = FL.take n (unsafeAppendN n initial)
2029−-- XXX Deprecate in major
2030−-- {-# DEPRECATED writeAppendN "Please use appendN instead." #-}
2031−{-# INLINE writeAppendN #-}
2032writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1722writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
2033 Int -> m (MutArray a) -> Fold m a (MutArray a)
1723 Int -> m (MutArray a) -> Fold m a (MutArray a)
2034−writeAppendN = appendN
1724+writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
2036−-- | @appendWith realloc action@ mutates the array generated by @action@ to
1726+-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
2037-- append the input stream. If there is no reserved space available in the
1727-- append the input stream. If there is no reserved space available in the
2038-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
1728-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
2039-- where @oldSize@ is the current size of the array in bytes.
1729-- where @oldSize@ is the current size of the array in bytes.
2041-- Note that the returned array may be a mutated version of original array.
1731-- Note that the returned array may be a mutated version of original array.
2043−-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
1733+-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
2045-- /Pre-release/
1735-- /Pre-release/
2046−{-# INLINE appendWith #-}
2047−appendWith :: forall m a. (MonadIO m, Unbox a) =>
2048− (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2049−appendWith sizer = FL.foldlM' (snocWith sizer)
2051−{-# DEPRECATED writeAppendWith "Please use appendWith instead." #-}
2052{-# INLINE writeAppendWith #-}
1736{-# INLINE writeAppendWith #-}
2053writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1737writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
2054 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
1738 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2055−writeAppendWith = appendWith
1739+writeAppendWith sizer = FL.foldlM' (snocWith sizer)
2057-- | @append action@ mutates the array generated by @action@ to append the
1741-- | @append action@ mutates the array generated by @action@ to append the
2058-- input stream. If there is no reserved space available in the array it is
1742-- input stream. If there is no reserved space available in the array it is
@@ -2060,101 +1744,70 @@ writeAppendWith = appendWith
2061-- Note that the returned array may be a mutated version of original array.
1745-- Note that the returned array may be a mutated version of original array.
2063−-- >>> append = MutArray.appendWith (* 2)
1747+-- >>> writeAppend = MutArray.writeAppendWith (* 2)
2065−{-# INLINE append #-}
2066−append :: forall m a. (MonadIO m, Unbox a) =>
2067− m (MutArray a) -> Fold m a (MutArray a)
2068−append = appendWith (* 2)
2070−-- XXX Deprecate in major
2071−-- {-# DEPRECATED writeAppend "Please use append instead." #-}
2072{-# INLINE writeAppend #-}
1749{-# INLINE writeAppend #-}
2073writeAppend :: forall m a. (MonadIO m, Unbox a) =>
1750writeAppend :: forall m a. (MonadIO m, Unbox a) =>
2074 m (MutArray a) -> Fold m a (MutArray a)
1751 m (MutArray a) -> Fold m a (MutArray a)
2075−writeAppend = append
1752+writeAppend = writeAppendWith (* 2)
2077-- XXX We can carry bound as well in the state to make sure we do not lose the
1754-- XXX We can carry bound as well in the state to make sure we do not lose the
2078-- remaining capacity. Need to check perf impact.
1755-- remaining capacity. Need to check perf impact.
2080−-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
1757+-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
2081−-- function as argument.
1758+-- as argument.
2083−-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
1760+-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
2085-- /Pre-release/
1762-- /Pre-release/
2086−{-# INLINE_NORMAL unsafeCreateOfWith #-}
1763+{-# INLINE_NORMAL writeNWithUnsafe #-}
2087−unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
1764+writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2088 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1765 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2089−unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
1766+writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2093 initial = toArrayUnsafe <$> alloc (max n 0)
1770 initial = toArrayUnsafe <$> alloc (max n 0)
2095 step (ArrayUnsafe contents start end) x = do
1772 step (ArrayUnsafe contents start end) x = do
2096− liftIO $ pokeAt end contents x
1773+ liftIO $ pokeByteIndex end contents x
2098 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
1775 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2100−{-# DEPRECATED writeNWithUnsafe "Please use unsafeCreateOfWith instead." #-}
2101−{-# INLINE writeNWithUnsafe #-}
2102−writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2103− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2104−writeNWithUnsafe = unsafeCreateOfWith
2106{-# INLINE_NORMAL writeNUnsafeAs #-}
1777{-# INLINE_NORMAL writeNUnsafeAs #-}
2107writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
1778writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
2108 => PinnedState -> Int -> Fold m a (MutArray a)
1779 => PinnedState -> Int -> Fold m a (MutArray a)
2109−writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
1780+writeNUnsafeAs ps = writeNWithUnsafe (newAs ps)
2111−-- | Like 'createOf' but does not check the array bounds when writing. The fold
1782+-- | Like 'writeN' but does not check the array bounds when writing. The fold
2112-- driver must not call the step function more than 'n' times otherwise it will
1783-- driver must not call the step function more than 'n' times otherwise it will
2113-- corrupt the memory and crash. This function exists mainly because any
1784-- corrupt the memory and crash. This function exists mainly because any
2114-- conditional in the step function blocks fusion causing 10x performance
1785-- conditional in the step function blocks fusion causing 10x performance
2115-- slowdown.
1786-- slowdown.
2117−-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
1788+-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.new
2119−{-# INLINE_NORMAL unsafeCreateOf #-}
2120−unsafeCreateOf :: forall m a. (MonadIO m, Unbox a)
2121− => Int -> Fold m a (MutArray a)
2122−unsafeCreateOf = writeNUnsafeAs Unpinned
2124−{-# DEPRECATED writeNUnsafe "Please use unsafeCreateOf instead." #-}
2125−{-# INLINE writeNUnsafe #-}
1790+{-# INLINE_NORMAL writeNUnsafe #-}
2126writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
1791writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
2127 => Int -> Fold m a (MutArray a)
1792 => Int -> Fold m a (MutArray a)
2128−writeNUnsafe = unsafeCreateOf
1793+writeNUnsafe = writeNUnsafeAs Unpinned
2130−-- | Like 'unsafeCreateOf' but creates a pinned array.
1795+-- | Like 'writeNUnsafe' but creates a pinned array.
2131−{-# INLINE_NORMAL unsafePinnedCreateOf #-}
2132−unsafePinnedCreateOf :: forall m a. (MonadIO m, Unbox a)
2133− => Int -> Fold m a (MutArray a)
2134−unsafePinnedCreateOf = writeNUnsafeAs Pinned
2136−{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
2137−{-# INLINE pinnedWriteNUnsafe #-}
1796+{-# INLINE_NORMAL pinnedWriteNUnsafe #-}
2138pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
1797pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
2139 => Int -> Fold m a (MutArray a)
1798 => Int -> Fold m a (MutArray a)
2140−pinnedWriteNUnsafe = unsafePinnedCreateOf
1799+pinnedWriteNUnsafe = writeNUnsafeAs Pinned
2142−-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
1801+-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
2143-- allocated using the @alloc@ function.
1802-- allocated using the @alloc@ function.
2145−-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
1804+-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
2146−-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
1805+-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
2148−{-# INLINE_NORMAL createOfWith #-}
1807+{-# INLINE_NORMAL writeNWith #-}
2149−createOfWith :: forall m a. (MonadIO m, Unbox a)
2150− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2151−createOfWith alloc n = FL.take n (unsafeCreateOfWith alloc n)
2153−-- {-# DEPRECATED writeNWith "Please use createOfWith instead." #-}
2154−{-# INLINE writeNWith #-}
2155writeNWith :: forall m a. (MonadIO m, Unbox a)
1808writeNWith :: forall m a. (MonadIO m, Unbox a)
2156 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1809 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2157−writeNWith = createOfWith
1810+writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
2159{-# INLINE_NORMAL writeNAs #-}
1812{-# INLINE_NORMAL writeNAs #-}
2160writeNAs ::
1813writeNAs ::
@@ -2162,42 +1815,28 @@ writeNAs ::
2162 => PinnedState
1815 => PinnedState
2164 -> Fold m a (MutArray a)
1817 -> Fold m a (MutArray a)
2165−writeNAs ps = createOfWith (newAs ps)
1818+writeNAs ps = writeNWith (newAs ps)
2167−-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
1820+-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
2168-- 'MutArray'.
1821-- 'MutArray'.
2170−-- >>> createOf = MutArray.createOfWith MutArray.new
1823+-- >>> writeN = MutArray.writeNWith MutArray.new
2171−-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
1824+-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
2172−-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
1825+-- >>> writeN n = MutArray.writeAppendN n (MutArray.new n)
2174−{-# INLINE_NORMAL createOf #-}
1827+{-# INLINE_NORMAL writeN #-}
2175−createOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2176−createOf = writeNAs Unpinned
2178−-- XXX Deprecate in major
2179−-- {-# DEPRECATED writeN "Please use createOf instead." #-}
2180−{-# INLINE writeN #-}
2181writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1828writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2182−writeN = createOf
1829+writeN = writeNAs Unpinned
2184−-- | Like 'createOf' but creates a pinned array.
2185−{-# INLINE_NORMAL pinnedCreateOf #-}
2187− forall m a. (MonadIO m, Unbox a)
2189− -> Fold m a (MutArray a)
2190−pinnedCreateOf = writeNAs Pinned
2192−{-# DEPRECATED pinnedWriteN "Please use pinnedCreateOf instead." #-}
1831+-- | Like 'writeN' but creates a pinned array.
2193−{-# INLINE pinnedWriteN #-}
1832+{-# INLINE_NORMAL pinnedWriteN #-}
2194pinnedWriteN ::
1833pinnedWriteN ::
2195 forall m a. (MonadIO m, Unbox a)
1834 forall m a. (MonadIO m, Unbox a)
2197 -> Fold m a (MutArray a)
1836 -> Fold m a (MutArray a)
2198−pinnedWriteN = pinnedCreateOf
1837+pinnedWriteN = writeNAs Pinned
2200−-- | Like unsafeCreateOfWith but writes the array in reverse order.
1839+-- | Like writeNWithUnsafe but writes the array in reverse order.
2202-- /Internal/
1841-- /Internal/
2203{-# INLINE_NORMAL writeRevNWithUnsafe #-}
1842{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -2214,11 +1853,11 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2215 step (ArrayUnsafe contents start end) x = do
1854 step (ArrayUnsafe contents start end) x = do
2216 let ptr = INDEX_PREV(start,a)
1855 let ptr = INDEX_PREV(start,a)
2217− liftIO $ pokeAt ptr contents x
1856+ liftIO $ pokeByteIndex ptr contents x
2219 $ ArrayUnsafe contents ptr end
1858 $ ArrayUnsafe contents ptr end
2221−-- | Like createOfWith but writes the array in reverse order.
1860+-- | Like writeNWith but writes the array in reverse order.
2223-- /Internal/
1862-- /Internal/
2224{-# INLINE_NORMAL writeRevNWith #-}
1863{-# INLINE_NORMAL writeRevNWith #-}
@@ -2226,36 +1865,31 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
2226 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1865 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2227writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
1866writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
2229−-- | Like 'createOf' but writes the array in reverse order.
1868+-- | Like writeN but writes the array in reverse order.
2231-- /Pre-release/
1870-- /Pre-release/
2232−{-# INLINE_NORMAL revCreateOf #-}
1871+{-# INLINE_NORMAL writeRevN #-}
2233−revCreateOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2234−revCreateOf = writeRevNWith new
2236−{-# DEPRECATED writeRevN "Please use revCreateOf instead." #-}
2237−{-# INLINE writeRevN #-}
2238writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1872writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2239−writeRevN = revCreateOf
1873+writeRevN = writeRevNWith new
2241-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
1875-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
2242-- input stream to a 'MutArray' aligned to the given size.
1876-- input stream to a 'MutArray' aligned to the given size.
2244−-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
1878+-- >>> pinnedWriteNAligned align = MutArray.writeNWith (MutArray.pinnedNewAligned align)
2245−-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
1879+-- >>> pinnedWriteNAligned align n = MutArray.writeAppendN n (MutArray.pinnedNewAligned align n)
2247-- /Pre-release/
1881-- /Pre-release/
2249{-# INLINE_NORMAL pinnedWriteNAligned #-}
1883{-# INLINE_NORMAL pinnedWriteNAligned #-}
2250pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
1884pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
2251 => Int -> Int -> Fold m a (MutArray a)
1885 => Int -> Int -> Fold m a (MutArray a)
2252−pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
1886+pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
2254-- XXX Buffer to a list instead?
1888-- XXX Buffer to a list instead?
2256-- | Buffer a stream into a stream of arrays.
1890-- | Buffer a stream into a stream of arrays.
2258−-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
1892+-- >>> writeChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
2260-- Breaking an array into an array stream can be useful to consume a large
1894-- Breaking an array into an array stream can be useful to consume a large
2261-- array sequentially such that memory of the array is released incrementatlly.
1895-- array sequentially such that memory of the array is released incrementatlly.
@@ -2264,43 +1898,37 @@ pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
2265-- /Unimplemented/
1899-- /Unimplemented/
2267−{-# INLINE_NORMAL buildChunks #-}
1901+{-# INLINE_NORMAL writeChunks #-}
2268−buildChunks :: (MonadIO m, Unbox a) =>
2269− Int -> Fold m a (StreamK n (MutArray a))
2270−buildChunks n = FL.many (createOf n) FL.toStreamK
2272−{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273−{-# INLINE writeChunks #-}
2274writeChunks :: (MonadIO m, Unbox a) =>
1902writeChunks :: (MonadIO m, Unbox a) =>
2275 Int -> Fold m a (StreamK n (MutArray a))
1903 Int -> Fold m a (StreamK n (MutArray a))
2276−writeChunks = buildChunks
1904+writeChunks n = FL.many (writeN n) FL.toStreamK
2278{-# INLINE_NORMAL writeWithAs #-}
1906{-# INLINE_NORMAL writeWithAs #-}
2279writeWithAs :: forall m a. (MonadIO m, Unbox a)
1907writeWithAs :: forall m a. (MonadIO m, Unbox a)
2280 => PinnedState -> Int -> Fold m a (MutArray a)
1908 => PinnedState -> Int -> Fold m a (MutArray a)
2281−-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
1909+-- writeWithAs ps n = FL.rmapM rightSize $ writeAppendWith (* 2) (newAs ps n)
2282writeWithAs ps elemCount =
1910writeWithAs ps elemCount =
2283 FL.rmapM extract $ FL.foldlM' step initial
1911 FL.rmapM extract $ FL.foldlM' step initial
2287 initial = do
1915 initial = do
2288− when (elemCount < 0) $ error "createWith: elemCount is negative"
1916+ when (elemCount < 0) $ error "writeWith: elemCount is negative"
2289− newAs ps elemCount
1917+ liftIO $ newAs ps elemCount
2291 step arr@(MutArray _ start end bound) x
1919 step arr@(MutArray _ start end bound) x
2292 | INDEX_NEXT(end,a) > bound = do
1920 | INDEX_NEXT(end,a) > bound = do
2293 let oldSize = end - start
1921 let oldSize = end - start
2294 newSize = max (oldSize * 2) 1
1922 newSize = max (oldSize * 2) 1
2295− arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
1923+ arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
2296 snocUnsafe arr1 x
1924 snocUnsafe arr1 x
2297 step arr x = snocUnsafe arr x
1925 step arr x = snocUnsafe arr x
2299 extract = liftIO . rightSize
1927 extract = liftIO . rightSize
2301−-- XXX Compare createWith with fromStreamD which uses an array of streams
1929+-- XXX Compare writeWith with fromStreamD which uses an array of streams
2302−-- implementation. We can write this using buildChunks above if that is faster.
1930+-- implementation. We can write this using writeChunks above if that is faster.
2303−-- If createWith is faster then we should use that to implement
1931+-- If writeWith is faster then we should use that to implement
2304-- fromStreamD.
1932-- fromStreamD.
2306-- XXX The realloc based implementation needs to make one extra copy if we use
1934-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2315,56 +1943,39 @@ writeWithAs ps elemCount =
2315-- XXX check if GHC's memory allocator is efficient enough. We can try the C
1943-- XXX check if GHC's memory allocator is efficient enough. We can try the C
2316-- malloc to compare against.
1944-- malloc to compare against.
2318−-- | @createWith minCount@ folds the whole input to a single array. The array
1946+-- | @writeWith minCount@ folds the whole input to a single array. The array
2319-- starts at a size big enough to hold minCount elements, the size is doubled
1947-- starts at a size big enough to hold minCount elements, the size is doubled
2320-- every time the array needs to be grown.
1948-- every time the array needs to be grown.
2322-- /Caution! Do not use this on infinite streams./
1950-- /Caution! Do not use this on infinite streams./
2324−-- >>> f n = MutArray.appendWith (* 2) (MutArray.emptyOf n)
1952+-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.new n)
2325−-- >>> createWith n = Fold.rmapM MutArray.rightSize (f n)
1953+-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
2326−-- >>> createWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
1954+-- >>> writeWith n = Fold.rmapM MutArray.fromArrayStreamK (MutArray.writeChunks n)
2328-- /Pre-release/
1956-- /Pre-release/
2329−{-# INLINE_NORMAL createWith #-}
1957+{-# INLINE_NORMAL writeWith #-}
2330−createWith :: forall m a. (MonadIO m, Unbox a)
2331− => Int -> Fold m a (MutArray a)
2332−-- createWith n = FL.rmapM rightSize $ appendWith (* 2) (emptyOf n)
2333−createWith = writeWithAs Unpinned
2335−{-# DEPRECATED writeWith "Please use createWith instead." #-}
2336−{-# INLINE writeWith #-}
2337writeWith :: forall m a. (MonadIO m, Unbox a)
1958writeWith :: forall m a. (MonadIO m, Unbox a)
2338 => Int -> Fold m a (MutArray a)
1959 => Int -> Fold m a (MutArray a)
2339−writeWith = createWith
1960+-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (new n)
1961+writeWith = writeWithAs Unpinned
2341-- | Fold the whole input to a single array.
1963-- | Fold the whole input to a single array.
2343−-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
1965+-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
2344-- rounded up to the element size.
1966-- rounded up to the element size.
2346-- /Caution! Do not use this on infinite streams./
1968-- /Caution! Do not use this on infinite streams./
2348−{-# INLINE create #-}
2349−create :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2350−create = createWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2352−-- XXX Deprecate in major
2353−-- {-# DEPRECATED write "Please use create instead." #-}
2354{-# INLINE write #-}
1970{-# INLINE write #-}
2355write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
1971write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2356−write = create
1972+write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2358−-- | Like 'create' but creates a pinned array.
1974+-- | Like 'write' but creates a pinned array.
2359−{-# INLINE pinnedCreate #-}
2360−pinnedCreate :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2362− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2364−{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
2365{-# INLINE pinnedWrite #-}
1975{-# INLINE pinnedWrite #-}
2366pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
1976pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2367−pinnedWrite = pinnedCreate
1977+pinnedWrite =
1978+ writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2369-------------------------------------------------------------------------------
1980-------------------------------------------------------------------------------
2370-- construct from streams, known size
1981-- construct from streams, known size
@@ -2374,31 +1985,25 @@ pinnedWrite = pinnedCreate
2374fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
1985fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
2375 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
1986 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
2376fromStreamDNAs ps limit str = do
1987fromStreamDNAs ps limit str = do
2377− (arr :: MutArray a) <- newAs ps limit
1988+ (arr :: MutArray a) <- liftIO $ newAs ps limit
2378 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
1989 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
2379 return $ arr {arrEnd = end}
1990 return $ arr {arrEnd = end}
2383 fwrite arrContents ptr x = do
1994 fwrite arrContents ptr x = do
2384− liftIO $ pokeAt ptr arrContents x
1995+ liftIO $ pokeByteIndex ptr arrContents x
2385 return $ INDEX_NEXT(ptr,a)
1996 return $ INDEX_NEXT(ptr,a)
2387−-- | Use the 'createOf' fold instead.
1998+-- | Use the 'writeN' fold instead.
2389−-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
2000+-- >>> fromStreamDN n = Stream.fold (MutArray.writeN n)
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
2397−{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398−{-# INLINE fromStreamDN #-}
2002+{-# INLINE_NORMAL fromStreamDN #-}
2399fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2003fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2400 => Int -> D.Stream m a -> m (MutArray a)
2004 => Int -> D.Stream m a -> m (MutArray a)
2005+-- fromStreamDN n = D.fold (writeN n)
2401−fromStreamDN = fromStreamN
2006+fromStreamDN = fromStreamDNAs Unpinned
2403-- | Create a 'MutArray' from the first N elements of a list. The array is
2008-- | Create a 'MutArray' from the first N elements of a list. The array is
2404-- allocated to size N, if the list terminates before N elements then the
2009-- allocated to size N, if the list terminates before N elements then the
@@ -2418,70 +2023,16 @@ pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
2418-- /Pre-release/
2023-- /Pre-release/
2419{-# INLINE fromListRevN #-}
2024{-# INLINE fromListRevN #-}
2420fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2025fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2421−fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
2026+fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
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
2430-- | Convert a pure stream in Identity monad to a mutable array.
2028-- | Convert a pure stream in Identity monad to a mutable array.
2431{-# INLINABLE fromPureStream #-}
2029{-# INLINABLE fromPureStream #-}
2432fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2030fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2433fromPureStream xs =
2031fromPureStream xs =
2434− D.fold create $ D.morphInner (return . runIdentity) xs
2032+ liftIO $ D.fold write $ D.morphInner (return . runIdentity) xs
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.
2443− _ <- unsafeAsPtr arr
2444− (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2445− return (arr {arrEnd = len})
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
2459− _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2460− return (arr {arrEnd = lenInt})
2462-------------------------------------------------------------------------------
2034-------------------------------------------------------------------------------
2463−-- convert a stream of arrays to a single array by reallocating and copying
2464−-------------------------------------------------------------------------------
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.
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
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.
2481− Nothing -> pure nil
2483−-------------------------------------------------------------------------------
2484−-- convert a stream of arrays to a single array by buffering arrays first
2035+-- convert stream to a single array
2485-------------------------------------------------------------------------------
2036-------------------------------------------------------------------------------
2487{-# INLINE arrayStreamKLength #-}
2038{-# INLINE arrayStreamKLength #-}
@@ -2491,72 +2042,34 @@ arrayStreamKLength as = K.foldl' (+) 0 (K.map length as)
2491-- | Convert an array stream to an array. Note that this requires peak memory
2042-- | Convert an array stream to an array. Note that this requires peak memory
2492-- that is double the size of the array stream.
2043-- that is double the size of the array stream.
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
2504−-- XXX Need to compare this with fromChunks and fromChunkList and keep the
2505−-- fastest or simplest one if all are equally fast.
2507−-- | Convert an array stream to an array. Note that this requires peak memory
2508−-- that is double the size of the array stream.
2510−-- Also see 'fromChunksRealloced'.
2512−{-# INLINE fromChunksK #-}
2513−fromChunksK :: (Unbox a, MonadIO m) =>
2514− StreamK m (MutArray a) -> m (MutArray a)
2515−fromChunksK = fromChunkskAs Unpinned
2517−{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2518{-# INLINE fromArrayStreamK #-}
2045{-# INLINE fromArrayStreamK #-}
2519fromArrayStreamK :: (Unbox a, MonadIO m) =>
2046fromArrayStreamK :: (Unbox a, MonadIO m) =>
2520 StreamK m (MutArray a) -> m (MutArray a)
2047 StreamK m (MutArray a) -> m (MutArray a)
2521−fromArrayStreamK = fromChunksK
2048+fromArrayStreamK as = do
2049+ len <- arrayStreamKLength as
2050+ fromStreamDN len $ D.unfoldMany reader $ D.fromStreamK as
2523{-# INLINE fromStreamDAs #-}
2052{-# INLINE fromStreamDAs #-}
2524fromStreamDAs ::
2053fromStreamDAs ::
2525 (MonadIO m, Unbox a) => PinnedState -> D.Stream m a -> m (MutArray a)
2054 (MonadIO m, Unbox a) => PinnedState -> D.Stream m a -> m (MutArray a)
2526−fromStreamDAs ps m =
2527− arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2055+fromStreamDAs ps m = arrayStreamKFromStreamDAs ps m >>= fromArrayStreamK
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.
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.
2538−{-# INLINE fromStream #-}
2539−fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2540−fromStream = fromStreamDAs Unpinned
2542−-- fromStream (Stream m) = P.fold create m
2543-- CAUTION: a very large number (millions) of arrays can degrade performance
2057-- CAUTION: a very large number (millions) of arrays can degrade performance
2544-- due to GC overhead because we need to buffer the arrays before we flatten
2058-- due to GC overhead because we need to buffer the arrays before we flatten
2545-- all the arrays.
2059-- all the arrays.
2547−-- XXX Compare if this is faster or "fold create".
2061+-- XXX Compare if this is faster or "fold write".
2549-- | We could take the approach of doubling the memory allocation on each
2063-- | We could take the approach of doubling the memory allocation on each
2550-- overflow. This would result in more or less the same amount of copying as in
2064-- overflow. This would result in more or less the same amount of copying as in
2551-- the chunking approach. However, if we have to shrink in the end then it may
2065-- the chunking approach. However, if we have to shrink in the end then it may
2552-- result in an extra copy of the entire data.
2066-- result in an extra copy of the entire data.
2554−-- >>> fromStreamD = StreamD.fold MutArray.create
2068+-- >>> fromStreamD = StreamD.fold MutArray.write
2556{-# INLINE fromStreamD #-}
2070{-# INLINE fromStreamD #-}
2557−{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
2558fromStreamD :: (MonadIO m, Unbox a) => D.Stream m a -> m (MutArray a)
2071fromStreamD :: (MonadIO m, Unbox a) => D.Stream m a -> m (MutArray a)
2559−fromStreamD = fromStream
2072+fromStreamD = fromStreamDAs Unpinned
2561-- | Create a 'MutArray' from a list. The list must be of finite size.
2074-- | Create a 'MutArray' from a list. The list must be of finite size.
@@ -2581,44 +2094,22 @@ fromListRev xs = fromListRevN (Prelude.length xs) xs
2581-- Cloning
2094-- Cloning
2582-------------------------------------------------------------------------------
2095-------------------------------------------------------------------------------
2584−-- Arrays are aligned on 64-bit boundaries. The fastest way to copy an array is
2585−-- to unsafeCast it to Word64, read it, write it to Word64 array and unsafeCast
2586−-- it again. We can use SIMD read/write as well.
2588{-# INLINE cloneAs #-}
2097{-# INLINE cloneAs #-}
2595− => PinnedState -> MutArray a -> m (MutArray a)
2098+cloneAs :: MonadIO m => PinnedState -> MutArray a -> m (MutArray a)
2596cloneAs ps src =
2099cloneAs ps src =
2597− do
2100+ liftIO $ do
2598 let startSrc = arrStart src
2101 let startSrc = arrStart src
2599 srcLen = arrEnd src - startSrc
2102 srcLen = arrEnd src - startSrc
2600− newArrContents <-
2103+ newArrContents <- Unboxed.newBytesAs ps srcLen
2601− Unboxed.cloneSliceUnsafeAs ps startSrc srcLen (arrContents src)
2104+ putSliceUnsafe (arrContents src) startSrc newArrContents 0 srcLen
2602 return $ MutArray newArrContents 0 srcLen srcLen
2105 return $ MutArray newArrContents 0 srcLen srcLen
2604{-# INLINE clone #-}
2107{-# INLINE clone #-}
2611− => MutArray a -> m (MutArray a)
2108+clone :: MonadIO m => MutArray a -> m (MutArray a)
2612clone = cloneAs Unpinned
2109clone = cloneAs Unpinned
2614{-# INLINE pinnedClone #-}
2111{-# INLINE pinnedClone #-}
2621− => MutArray a -> m (MutArray a)
2112+pinnedClone :: MonadIO m => MutArray a -> m (MutArray a)
2622pinnedClone = cloneAs Pinned
2113pinnedClone = cloneAs Pinned
2624-------------------------------------------------------------------------------
2115-------------------------------------------------------------------------------
@@ -2633,16 +2124,17 @@ spliceCopy :: forall m a. MonadIO m =>
2633 Unbox a =>
2124 Unbox a =>
2635 MutArray a -> MutArray a -> m (MutArray a)
2126 MutArray a -> MutArray a -> m (MutArray a)
2636−spliceCopy arr1 arr2 = do
2127+spliceCopy arr1 arr2 = liftIO $ do
2637 let start1 = arrStart arr1
2128 let start1 = arrStart arr1
2638 start2 = arrStart arr2
2129 start2 = arrStart arr2
2639 len1 = arrEnd arr1 - start1
2130 len1 = arrEnd arr1 - start1
2640 len2 = arrEnd arr2 - start2
2131 len2 = arrEnd arr2 - start2
2641− let len = len1 + len2
2132+ let newLen = len1 + len2
2642 newArrContents <-
2133 newArrContents <-
2643 if Unboxed.isPinned (arrContents arr1)
2134 if Unboxed.isPinned (arrContents arr1)
2644− then liftIO $ Unboxed.pinnedNew len
2135+ then Unboxed.pinnedNewBytes newLen
2645− else liftIO $ Unboxed.new len
2136+ else Unboxed.newBytes newLen
2137+ let len = len1 + len2
2646 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
2138 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
2647 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
2139 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
2648 return $ MutArray newArrContents 0 len len
2140 return $ MutArray newArrContents 0 len len
@@ -2654,7 +2146,7 @@ spliceCopy arr1 arr2 = do
2654spliceUnsafe :: MonadIO m =>
2146spliceUnsafe :: MonadIO m =>
2655 MutArray a -> MutArray a -> m (MutArray a)
2147 MutArray a -> MutArray a -> m (MutArray a)
2656spliceUnsafe dst src =
2148spliceUnsafe dst src =
2657− do
2149+ liftIO $ do
2658 let startSrc = arrStart src
2150 let startSrc = arrStart src
2659 srcLen = arrEnd src - startSrc
2151 srcLen = arrEnd src - startSrc
2660 endDst = arrEnd dst
2152 endDst = arrEnd dst
@@ -2676,7 +2168,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
2676 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2168 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2677spliceWith sizer dst@(MutArray _ start end bound) src = do
2169spliceWith sizer dst@(MutArray _ start end bound) src = do
2679− let f = appendWith (`sizer` byteLength src) (return dst)
2171+ let f = writeAppendWith (`sizer` byteLength src) (return dst)
2680 in D.fold f (toStreamD src)
2172 in D.fold f (toStreamD src)
2682 assert (end <= bound) (return ())
2174 assert (end <= bound) (return ())
@@ -2692,7 +2184,7 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
2692 $ "splice: newSize is less than the total size "
2184 $ "splice: newSize is less than the total size "
2693 ++ "of arrays being appended. Please check the "
2185 ++ "of arrays being appended. Please check the "
2694 ++ "sizer function passed."
2186 ++ "sizer function passed."
2695− realloc newSizeInBytes dst
2187+ liftIO $ realloc newSizeInBytes dst
2696 else return dst
2188 else return dst
2697 spliceUnsafe dst1 src
2189 spliceUnsafe dst1 src
@@ -2729,24 +2221,14 @@ spliceExp = spliceWith (\l1 l2 -> max (l1 * 2) (l1 + l2))
2729-- Splitting
2221-- Splitting
2730-------------------------------------------------------------------------------
2222-------------------------------------------------------------------------------
2732−-- | Generate a stream of array slices using a predicate. The array element
2733−-- matching the predicate is dropped.
2736−{-# INLINE splitOn #-}
2737−splitOn :: (MonadIO m, Unbox a) =>
2738− (a -> Bool) -> MutArray a -> Stream m (MutArray a)
2739−splitOn predicate arr =
2740− fmap (\(i, len) -> getSliceUnsafe i len arr)
2741− $ D.indexOnSuffix predicate (read arr)
2743-- | Drops the separator byte
2224-- | Drops the separator byte
2744{-# INLINE breakOn #-}
2225{-# INLINE breakOn #-}
2745breakOn :: MonadIO m
2226breakOn :: MonadIO m
2746 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2227 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2747−breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2228+breakOn sep arr@MutArray{..} = asPtrUnsafe arr $ \p -> liftIO $ do
2229+ -- XXX Instead of using asPtrUnsafe (pinning memory) we can pass unlifted
2230+ -- Addr# to memchr and it should be safe (from ghc 8.4).
2748 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2231 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2749− -- Need efficient stream based primitives that work on Word64.
2750 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
2232 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
2751 let sepIndex = loc `minusPtr` p
2233 let sepIndex = loc `minusPtr` p
2752 return $
2234 return $
@@ -2767,41 +2249,32 @@ breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2770−-- | Like 'splitAt' but does not check whether the index is valid.
2772−{-# INLINE unsafeSplitAt #-}
2773−unsafeSplitAt :: forall a. Unbox a =>
2774− Int -> MutArray a -> (MutArray a, MutArray a)
2775−unsafeSplitAt i MutArray{..} =
2776− let off = i * SIZE_OF(a)
2779− { arrContents = arrContents
2780− , arrStart = arrStart
2785− { arrContents = arrContents
2788− , arrBound = arrBound
2792-- | Create two slices of an array without copying the original array. The
2252-- | Create two slices of an array without copying the original array. The
2793-- specified index @i@ is the first index of the second slice.
2253-- specified index @i@ is the first index of the second slice.
2795−{-# INLINE splitAt #-}
2796splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2255splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2797−splitAt i arr =
2256+splitAt i arr@MutArray{..} =
2798 let maxIndex = length arr - 1
2257 let maxIndex = length arr - 1
2799 in if i < 0
2258 in if i < 0
2800 then error "sliceAt: negative array index"
2259 then error "sliceAt: negative array index"
2801 else if i > maxIndex
2260 else if i > maxIndex
2802 then error $ "sliceAt: specified array index " ++ show i
2261 then error $ "sliceAt: specified array index " ++ show i
2803 ++ " is beyond the maximum index " ++ show maxIndex
2262 ++ " is beyond the maximum index " ++ show maxIndex
2804− else unsafeSplitAt i arr
2263+ else let off = i * SIZE_OF(a)
2266+ { arrContents = arrContents
2267+ , arrStart = arrStart
2272+ { arrContents = arrContents
2275+ , arrBound = arrBound
2806-------------------------------------------------------------------------------
2279-------------------------------------------------------------------------------
2807-- Casting
2280-- Casting
@@ -2851,13 +2324,9 @@ cast arr =
2851-- guarantees that unsafe calls will be performed in the calling thread. Making
2324-- guarantees that unsafe calls will be performed in the calling thread. Making
2852-- it safe to pass heap-allocated objects to unsafe functions.
2325-- it safe to pass heap-allocated objects to unsafe functions.
2854−-- XXX Should we just name it asPtr, the unsafety is implicit for any pointer
2327+-- Should we just name it asPtr, the unsafety is implicit for any pointer
2855-- operations. And we are safe from Haskell perspective because we will be
2328-- operations. And we are safe from Haskell perspective because we will be
2856-- pinning the memory.
2329-- pinning the memory.
2858−-- XXX we cannot pass the length of the ptr here as in some cases it may not be
2859−-- available e.g. a null terminated C string. However, we can create another
2860−-- flavor of the API e.g. asPtrN.
2862-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
2331-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
2863-- array as a pointer to some operating system call or to a "safe" FFI call.
2332-- array as a pointer to some operating system call or to a "safe" FFI call.
@@ -2875,377 +2344,48 @@ cast arr =
2876-- /Pre-release/
2345-- /Pre-release/
2878−{-# INLINE unsafePinnedAsPtr #-}
2879−unsafePinnedAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2880−unsafePinnedAsPtr arr f =
2881− Unboxed.unsafePinnedAsPtr
2882− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2884−{-# DEPRECATED asPtrUnsafe "Please use unsafePinnedAsPtr instead." #-}
2885{-# INLINE asPtrUnsafe #-}
2347{-# INLINE asPtrUnsafe #-}
2886asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2348asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2887−asPtrUnsafe = unsafePinnedAsPtr
2349+asPtrUnsafe arr f =
2888−
2350+ Unboxed.asPtrUnsafe
2889−{-# INLINE unsafeAsPtr #-}
2890−unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2892− Unboxed.unsafeAsPtr
2893 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2351 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2895-------------------------------------------------------------------------------
2353-------------------------------------------------------------------------------
2896-- Equality
2354-- Equality
2897-------------------------------------------------------------------------------
2355-------------------------------------------------------------------------------
2899−-- | Byte compare two arrays. Compare the length of the arrays. If the length
2357+-- | Compare the length of the arrays. If the length is equal, compare the
2900−-- is equal, compare the lexicographical ordering of two underlying byte arrays
2358+-- lexicographical ordering of two underlying byte arrays otherwise return the
2901−-- otherwise return the result of length comparison.
2359+-- result of length comparison.
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.
2907-- /Pre-release/
2361-- /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
2918− r <- liftIO $ IO $ \s# ->
2921− (compareByteArrays#
2922− (unsafeCoerce# marr1)
2924− (unsafeCoerce# marr2)
2928− return $ compare r 0
2931{-# INLINE cmp #-}
2362{-# INLINE cmp #-}
2932−{-# DEPRECATED cmp "Please use byteCmp instead." #-}
2933cmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2363cmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2934−cmp = byteCmp
2364+cmp arr1 arr2 =
2367+ let marr1 = getMutableByteArray# (arrContents arr1)
2368+ marr2 = getMutableByteArray# (arrContents arr2)
2369+ !(I# st1#) = arrStart arr1
2370+ !(I# st2#) = arrStart arr2
2371+ !(I# len#) = byteLength arr1
2372+ case compare (byteLength arr1) (byteLength arr2) of
2374+ r <- liftIO $ IO $ \s# ->
2377+ (compareByteArrays#
2378+ (unsafeCoerce# marr1)
2380+ (unsafeCoerce# marr2)
2384+ return $ compare r 0
2936−-- | Byte equality of two arrays.
2938−-- >>> byteEq arr1 arr2 = (==) EQ $ MArray.byteCmp arr1 arr2
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
2945−-------------------------------------------------------------------------------
2947-------------------------------------------------------------------------------
2387-------------------------------------------------------------------------------
2949−-- Note: LE versions avoid an extra copy compared to GE. LE parser trades
2950−-- backtracking one array in lieu of avoiding a copy. However, LE and GE both
2951−-- can leave some memory unused. They can split the last array to fit it
2952−-- exactly in the space.
2954−{-# INLINE_NORMAL pCompactLeAs #-}
2956− forall m a. (MonadIO m, Unbox a)
2957− => PinnedState -> Int -> Parser (MutArray a) m (MutArray a)
2958−pCompactLeAs ps maxElems = Parser step initial extract
2962− maxBytes = maxElems * SIZE_OF(a)
2964− functionName = "Streamly.Internal.Data.MutArray.pCompactLE"
2971− ++ ": the size of arrays ["
2972− ++ show maxElems ++ "] must be a natural number"
2973− else Parser.IPartial Nothing
2977− $ let len = byteLength arr
2978− in if len >= maxBytes
2979− then Parser.Done 0 arr
2980− else Parser.Partial 0 (Just arr)
2981− -- XXX Split the last array to use the space more compactly.
2982− step (Just buf) arr =
2983− let len = byteLength buf + byteLength arr
2984− in if len > maxBytes
2985− then return $ Parser.Done 1 buf
2988− if byteCapacity buf < maxBytes
2989− then liftIO $ reallocExplicitAs
2990− ps (SIZE_OF(a)) maxBytes buf
2992− buf2 <- spliceUnsafe buf1 arr
2993− return $ Parser.Partial 0 (Just buf2)
2995− extract Nothing = return $ Parser.Done 0 nil
2996− extract (Just buf) = return $ Parser.Done 0 buf
2998−-- | Parser @pCompactLE maxElems@ coalesces adjacent arrays in the input stream
2999−-- only if the combined size would be less than or equal to @maxElems@
3000−-- elements. Note that it won't split an array if the original array is already
3001−-- larger than maxElems.
3003−-- @maxElems@ must be greater than 0.
3005−-- Generates unpinned arrays irrespective of the pinning status of input
3009−{-# INLINE pCompactLE #-}
3011− forall m a. (MonadIO m, Unbox a)
3012− => Int -> Parser (MutArray a) m (MutArray a)
3013−pCompactLE = pCompactLeAs Unpinned
3015−-- | Pinned version of 'pCompactLE'.
3016−{-# INLINE pPinnedCompactLE #-}
3018− forall m a. (MonadIO m, Unbox a)
3019− => Int -> Parser (MutArray a) m (MutArray a)
3020−pPinnedCompactLE = pCompactLeAs Pinned
3022−data SpliceState s arr
3024− | SpliceBuffering s arr
3025− | SpliceYielding arr (SpliceState s arr)
3028−-- This mutates the first array (if it has space) to append values from the
3029−-- second one. This would work for immutable arrays as well because an
3030−-- immutable array never has additional space so a new array is allocated
3031−-- instead of mutating it.
3033−{-# INLINE_NORMAL compactLeAs #-}
3034−compactLeAs :: forall m a. (MonadIO m, Unbox a)
3035− => PinnedState -> Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
3036−compactLeAs ps maxElems (D.Stream step state) =
3037− D.Stream step' (SpliceInitial state)
3041− maxBytes = maxElems * SIZE_OF(a)
3043− functionName = "Streamly.Internal.Data.MutArray.rCompactLE"
3045− {-# INLINE_LATE step' #-}
3046− step' gst (SpliceInitial st) = do
3047− when (maxElems <= 0) $
3048− -- XXX we can pass the module string from the higher level API
3049− error $ functionName ++ ": the size of arrays [" ++ show maxElems
3050− ++ "] must be a natural number"
3053− D.Yield arr s -> return $
3054− let len = byteLength arr
3055− in if len >= maxBytes
3056− then D.Skip (SpliceYielding arr (SpliceInitial s))
3057− else D.Skip (SpliceBuffering s arr)
3058− D.Skip s -> return $ D.Skip (SpliceInitial s)
3059− D.Stop -> return D.Stop
3061− -- XXX Split the last array to use the space more compactly.
3062− step' gst (SpliceBuffering st buf) = do
3065− D.Yield arr s -> do
3066− let len = byteLength buf + byteLength arr
3069− D.Skip (SpliceYielding buf (SpliceBuffering s arr))
3071− buf1 <- if byteCapacity buf < maxBytes
3072− then liftIO $ reallocExplicitAs
3073− ps (SIZE_OF(a)) maxBytes buf
3075− buf2 <- spliceUnsafe buf1 arr
3076− return $ D.Skip (SpliceBuffering s buf2)
3077− D.Skip s -> return $ D.Skip (SpliceBuffering s buf)
3078− D.Stop -> return $ D.Skip (SpliceYielding buf SpliceFinish)
3080− step' _ SpliceFinish = return D.Stop
3082− step' _ (SpliceYielding arr next) = return $ D.Yield arr next
3085−{-# INLINE_NORMAL fCompactGeAs #-}
3087− forall m a. (MonadIO m, Unbox a)
3088− => PinnedState -> Int -> FL.Fold m (MutArray a) (MutArray a)
3089−fCompactGeAs ps minElems = Fold step initial extract extract
3093− minBytes = minElems * SIZE_OF(a)
3095− functionName = "Streamly.Internal.Data.MutArray.fCompactGE"
3102− ++ ": the size of arrays ["
3103− ++ show minElems ++ "] must be a natural number"
3104− else FL.Partial Nothing
3108− $ let len = byteLength arr
3109− in if len >= minBytes
3111− else FL.Partial (Just arr)
3112− -- XXX Buffer arrays as a list to avoid copy and reallocations
3113− step (Just buf) arr = do
3114− let len = byteLength buf + byteLength arr
3116− if byteCapacity buf < len
3117− then liftIO $ reallocExplicitAs
3118− ps (SIZE_OF(a)) (max minBytes len) buf
3120− buf2 <- spliceUnsafe buf1 arr
3122− then return $ FL.Done buf2
3123− else return $ FL.Partial (Just buf2)
3125− extract Nothing = return nil
3126− extract (Just buf) = return buf
3128−-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
3129−-- until the size becomes greater than or equal to @minElems@.
3131−-- Generates unpinned arrays irrespective of the pinning status of input
3133−{-# INLINE fCompactGE #-}
3135− forall m a. (MonadIO m, Unbox a)
3136− => Int -> FL.Fold m (MutArray a) (MutArray a)
3137−fCompactGE = fCompactGeAs Unpinned
3139−-- | Pinned version of 'fCompactGE'.
3140−{-# INLINE fPinnedCompactGE #-}
3142− forall m a. (MonadIO m, Unbox a)
3143− => Int -> FL.Fold m (MutArray a) (MutArray a)
3144−fPinnedCompactGE = fCompactGeAs Pinned
3146−{-# INLINE_NORMAL lCompactGeAs #-}
3147−lCompactGeAs :: forall m a. (MonadIO m, Unbox a)
3148− => PinnedState -> Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3149−-- The fold version turns out to be a little bit slower.
3150−-- lCompactGeAs ps n = FL.many (fCompactGeAs ps n)
3151−lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
3152− Fold step initial extract final
3156− minBytes = minElems * SIZE_OF(a)
3158− functionName = "Streamly.Internal.Data.MutArray.lCompactGE"
3161− when (minElems <= 0) $
3162− -- XXX we can pass the module string from the higher level API
3163− error $ functionName ++ ": the size of arrays ["
3164− ++ show minElems ++ "] must be a natural number"
3167− return $ first (Tuple' Nothing) r
3169− {-# INLINE runInner #-}
3170− runInner len acc buf =
3175− FL.Done _ -> return $ FL.Done ()
3179− return $ first (Tuple' Nothing) res
3180− else return $ FL.Partial $ Tuple' (Just buf) acc
3182− step (Tuple' Nothing r1) arr =
3183− runInner (byteLength arr) r1 arr
3185− -- XXX Buffer arrays as a list to avoid copy and reallocations
3186− step (Tuple' (Just buf) r1) arr = do
3187− let len = byteLength buf + byteLength arr
3188− buf1 <- if byteCapacity buf < len
3189− then liftIO $ reallocExplicitAs
3190− ps (SIZE_OF(a)) (max minBytes len) buf
3192− buf2 <- spliceUnsafe buf1 arr
3193− runInner len r1 buf2
3195− -- XXX Several folds do extract >=> final, therefore, we need to make final
3196− -- return "m b" rather than using extract post it if we want extract to be
3199− -- extract forces the pending buffer to be sent to the fold which is not
3201− extract _ = error "lCompactGE: not designed for scanning"
3203− final (Tuple' Nothing r1) = final1 r1
3204− final (Tuple' (Just buf) r1) = do
3207− FL.Partial rr -> final1 rr
3208− FL.Done _ -> return ()
3210−-- | Like 'compactGE' but for transforming folds instead of stream.
3212−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3214−-- Generates unpinned arrays irrespective of the pinning status of input
3216−{-# INLINE lCompactGE #-}
3217−lCompactGE :: forall m a. (MonadIO m, Unbox a)
3218− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3219−lCompactGE = lCompactGeAs Unpinned
3221−-- | Pinned version of 'lCompactGE'.
3222−{-# INLINE lPinnedCompactGE #-}
3223−lPinnedCompactGE :: forall m a. (MonadIO m, Unbox a)
3224− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3225−lPinnedCompactGE = lCompactGeAs Pinned
3227−-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3228−-- the size becomes greater than or equal to @n@.
3230−-- >>> compactGE n = Stream.foldMany (MutArray.fCompactGE n)
3232−{-# INLINE compactGE #-}
3234− (MonadIO m, Unbox a)
3235− => Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3236−compactGE n = D.foldMany (fCompactGE n)
3238−-- | 'compactEQ n' coalesces adajacent arrays in the input stream to
3239−-- arrays of exact size @n@.
3242−{-# INLINE compactEQ #-}
3243−compactEQ :: -- (MonadIO m, Unbox a) =>
3244− Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3245−compactEQ _n = undefined -- D.parseManyD (pCompactEQ n)
3247−-------------------------------------------------------------------------------
3248−-- In-place mutation algorithms
3249-------------------------------------------------------------------------------
2389-------------------------------------------------------------------------------
3251-- | Strip elements which match with predicate from both ends.
2391-- | Strip elements which match with predicate from both ends.
@@ -3274,7 +2414,7 @@ strip eq arr@MutArray{..} = liftIO $ do
3274 getStart cur = do
2414 getStart cur = do
3275 if cur < arrEnd
2415 if cur < arrEnd
3277− r <- peekAt cur arrContents
2417+ r <- peekByteIndex cur arrContents
3279 then getStart (INDEX_NEXT(cur,a))
2419 then getStart (INDEX_NEXT(cur,a))
3280 else return cur
2420 else return cur
@@ -3284,7 +2424,7 @@ strip eq arr@MutArray{..} = liftIO $ do
3284 if cur > low
2424 if cur > low
3286 let prev = INDEX_PREV(cur,a)
2426 let prev = INDEX_PREV(cur,a)
3287− r <- peekAt prev arrContents
2427+ r <- peekByteIndex prev arrContents
3289 then getLast prev low
2429 then getLast prev low
3290 else return cur
2430 else return cur