@@ -1,7 +1,7 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE UnboxedTuples #-}
33-- |
4−-- Module : Streamly.Internal.Data.MutArray.Type
4+-- Module : Streamly.Internal.Data.Array.Mut.Type
55-- Copyright : (c) 2020 Composewell Technologies
66-- License : BSD3-3-Clause
77-- Maintainer : streamly@composewell.com
@@ -26,82 +26,55 @@
2626-- strive to keep the API consistent for both. Ideally, you should be able to
2727-- replace one with another with little changes to the code.
2828
29−module Streamly.Internal.Data.MutArray.Type
29+module Streamly.Internal.Data.Array.Mut.Type
3030 (
31− -- ** Type
31+ -- * Type
3232 -- $arrayNotes
3333 MutArray (..)
34−
35− -- ** Conversion
36− -- *** Pinned and Unpinned
34+ , MutableByteArray
35+ , touch
3736 , pin
3837 , unpin
39− , isPinned
40−
41− -- ** Casting
42− , cast
43− , castUnsafe -- XXX unsafeCast
44− , asBytes
45− , unsafePinnedAsPtr
46− , unsafeAsPtr
4738
39+ -- * Constructing and Writing
4840 -- ** Construction
49− , empty
50−
51− -- *** New
52− -- | New arrays are always empty arrays with some reserve capacity to
53− -- extend the length without reallocating.
54− , emptyOf
55− , newArrayWith -- emptyAlignedWith
56− , pinnedEmptyOf
57− , pinnedNewAligned -- XXX not required
58− -- , new -- uninitialized array of specified length
59−
60− -- *** Cloning
61− , clone
62− , pinnedClone
63−
64− -- *** Slicing
65− -- | Get a subarray without copying
66− , getSliceUnsafe -- XXX unsafeGetSlice
67− , getSlice
68− , splitAt -- XXX should be able to express using getSlice
69− , breakOn
41+ , nil
7042
71− -- *** Stream Folds
43+ -- *** Uninitialized Arrays
44+ , newPinned
45+ , newPinnedBytes
46+ , newAlignedPinned
47+ , new
48+ , newArrayWith
49+
50+ -- *** Initialized Arrays
51+ , withNewArrayUnsafe
52+
53+ -- *** From streams
7254 , ArrayUnsafe (..)
73− , unsafeCreateOfWith
74− , unsafeCreateOf
75− , unsafePinnedCreateOf
76− , pinnedCreateOf
77− , createOfWith
78− , createOf
79− , revCreateOf
80−
81− , pinnedCreate
82− , createWith
83− , create
84− -- , revCreate
85−
86− -- *** From containers
55+ , writeNWithUnsafe
56+ , writeNWith
57+ , writeNUnsafe
58+ , writeN
59+ , writeNAligned
60+
61+ , writeWith
62+ , write
63+
64+ , writeRevN
65+ -- , writeRev
66+
67+ -- ** From containers
8768 , fromListN
88− , pinnedFromListN
8969 , fromList
90− , pinnedFromList
9170 , fromListRevN
9271 , fromListRev
93− , fromStreamN
94− , fromStream
95− , fromPureStreamN
96− , fromPureStream
97− , fromByteStr#
98− , fromPtrN
99− , fromChunksK
100− , fromChunksRealloced -- fromSmallChunks
101−
102− -- ** Random writes
72+ , fromStreamDN
73+ , fromStreamD
74+
75+ -- * Random writes
10376 , putIndex
104− , putIndexUnsafe -- XXX unsafePutIndex
77+ , putIndexUnsafe
10578 , putIndices
10679 -- , putFromThenTo
10780 -- , putFrom -- start writing at the given position
@@ -109,71 +82,78 @@ module Streamly.Internal.Data.MutArray.Type
10982 -- , putFromTo
11083 -- , putFromRev
11184 -- , putUptoRev
112− , modifyIndexUnsafe -- XXX unsafeModifyIndex
85+ , modifyIndexUnsafe
11386 , modifyIndex
11487 , modifyIndices
11588 , modify
11689 , swapIndices
11790 , unsafeSwapIndices
11891
119− -- ** Reading
92+ -- * Growing and Shrinking
93+ -- Arrays grow only at the end, though it is possible to grow on both sides
94+ -- and therefore have a cons as well as snoc. But that will require two
95+ -- bounds in the array representation.
12096
121− -- *** Indexing
122− , getIndex
123− , getIndexUnsafe -- XXX unsafeGetIndex
124− -- , getFromThenTo
125− , getIndexRev -- getRevIndex?
126− , indexReader
127− , indexReaderWith
128−
129− -- *** To Streams
130− , read
131− , readRev
132− , toStreamWith
133− , toStreamRevWith
134− , toStreamK
135− , toStreamKWith
136− , toStreamKRev
137− , toStreamKRevWith
97+ -- ** Appending elements
98+ , snocWith
99+ , snoc
100+ , snocLinear
101+ , snocMay
102+ , snocUnsafe
138103
139− -- *** To Containers
140− , toList
104+ -- ** Appending streams
105+ , writeAppendNUnsafe
106+ , writeAppendN
107+ , writeAppendWith
108+ , writeAppend
141109
142− -- *** Unfolds
143− -- experimental
144− , producerWith
145− , producer
110+ -- * Eliminating and Reading
146111
112+ -- ** To streams
147113 , reader
148114 , readerRevWith
149115 , readerRev
150116
151− -- ** Size and Capacity
152− -- *** Size
153− , length
154− , byteLength
117+ -- ** To containers
118+ , toStreamDWith
119+ , toStreamDRevWith
120+ , toStreamKWith
121+ , toStreamKRevWith
122+ , toStreamD
123+ , toStreamDRev
124+ , toStreamK
125+ , toStreamKRev
126+ , toList
155127
156− -- *** Capacity
157− -- , capacity
158− , byteCapacity
159− , bytesFree
128+ -- experimental
129+ , producerWith
130+ , producer
160131
161− -- *** Capacity Management
132+ -- ** Random reads
133+ , getIndex
134+ , getIndexUnsafe
135+ , getIndices
136+ , getIndicesD
137+ -- , getFromThenTo
138+ , getIndexRev
139+
140+ -- * Memory Management
162141 , blockSize
163142 , arrayChunkBytes
164143 , allocBytesToElemCount
165− , realloc -- this is "resize"
166− , grow
167− , growExp
144+ , realloc
145+ , resize
146+ , resizeExp
168147 , rightSize
169148
170− -- ** Folding
171− , foldl'
172− , foldr
173− , byteCmp
174− , byteEq
149+ -- * Size
150+ , length
151+ , byteLength
152+ -- , capacity
153+ , byteCapacity
154+ , bytesFree
175155
176− -- ** In-place Mutation Algorithms
156+ -- * In-place Mutation Algorithms
177157 , strip
178158 , reverse
179159 , permute
@@ -183,121 +163,59 @@ module Streamly.Internal.Data.MutArray.Type
183163 , mergeBy
184164 , bubble
185165
186− -- ** Growing and Shrinking
187− -- | Arrays grow only at the end, though it is possible to grow on both
188− -- sides and therefore have a cons as well as snoc. But that will require
189− -- both lower and upper bound in the array representation.
166+ -- * Casting
167+ , cast
168+ , castUnsafe
169+ , asBytes
170+ , asPtrUnsafe
190171
191− -- *** Appending elements
192− , snocWith
193− , snoc
194− , snocLinear
195− , snocMay
196− , snocUnsafe -- XXX unsafeSnoc
172+ -- * Folding
173+ , foldl'
174+ , foldr
175+ , cmp
176+
177+ -- * Arrays of arrays
178+ -- We can add dimensionality parameter to the array type to get
179+ -- multidimensional arrays. Multidimensional arrays would just be a
180+ -- convenience wrapper on top of single dimensional arrays.
197181
198− -- *** Appending streams
199− , unsafeAppendN
200− , appendN
201− , appendWith
202− , append
182+ -- | Operations dealing with multiple arrays, streams of arrays or
183+ -- multidimensional array representations.
203184
204− -- *** Appending arrays
185+ -- ** Construct from streams
186+ , chunksOf
187+ , arrayStreamKFromStreamD
188+ , writeChunks
189+
190+ -- ** Eliminate to streams
191+ , flattenArrays
192+ , flattenArraysRev
193+ , fromArrayStreamK
194+
195+ -- ** Construct from arrays
196+ -- get chunks without copying
197+ , getSliceUnsafe
198+ , getSlice
199+ -- , getSlicesFromLenN
200+ , splitAt -- XXX should be able to express using getSlice
201+ , breakOn
202+
203+ -- ** Appending arrays
205204 , spliceCopy
206205 , spliceWith
207206 , splice
208207 , spliceExp
209− , spliceUnsafe -- XXX unsafeSplice
208+ , spliceUnsafe
209+ , putSliceUnsafe
210210 -- , putSlice
211211 -- , appendSlice
212212 -- , appendSliceFrom
213213
214− -- ** Serialization using Unbox
215− , pokeAppend
216− , pokeAppendMay
217− , pokeSkipUnsafe -- unsafePokeSkip
218−
219− -- ** Deserialization using Unbox
220− , peekUncons
221− , peekUnconsUnsafe -- unsafePeekUncons
222− , peekSkipUnsafe -- unsafePeekSkip
223−
224− -- Arrays of arrays
225− -- We can add dimensionality parameter to the array type to get
226− -- multidimensional arrays. Multidimensional arrays would just be a
227− -- convenience wrapper on top of single dimensional arrays.
228−
229− -- ** Streams of Arrays
230− -- *** Chunk
231− -- | Group a stream into arrays.
232− , chunksOf
233− , pinnedChunksOf
234− , buildChunks
235−
236− -- *** Split
237− -- | Split an array into slices.
238−
239− -- , getSlicesFromLenN
240− , splitOn
241− -- , slicesOf
242−
243− -- *** Concat
244− -- | Append the arrays in a stream to form a stream of elements.
245− , concatWith
246− , concatRevWith
247− , concat
248− , concatRev
249−
250− -- *** Compact
251− -- | Append the arrays in a stream to form a stream of larger arrays.
252− , SpliceState (..)
253− , pCompactLE
254− , pPinnedCompactLE
255− , compactLeAs
256− , fCompactGE
257− , fPinnedCompactGE
258− , lCompactGE
259− , lPinnedCompactGE
260− , compactGE
261− , compactEQ
262−
263− -- ** Utilities
214+ -- * Utilities
264215 , roundUpToPower2
265216 , memcpy
266217 , memcmp
267218 , c_memchr
268−
269− -- * Deprecated
270− , asPtrUnsafe
271− , writeChunks
272− , flattenArrays
273− , flattenArraysRev
274− , fromArrayStreamK
275− , fromStreamDN
276− , fromStreamD
277− , cmp
278− , getIndices
279− , getIndicesWith
280− , resize
281− , resizeExp
282− , nil
283− , new
284− , pinnedNew
285− , pinnedNewBytes
286− , writeAppendNUnsafe
287− , writeAppendN
288− , writeAppendWith
289− , writeAppend
290− , writeNWithUnsafe
291− , writeNWith
292− , writeNUnsafe
293− , pinnedWriteNUnsafe
294− , writeN
295− , pinnedWriteN
296− , pinnedWriteNAligned -- XXX not required
297− , writeWith
298− , write
299− , pinnedWrite
300− , writeRevN
301219 )
302220where
303221
@@ -308,52 +226,48 @@ where
308226
309227import Control.Monad (when, void)
310228import Control.Monad.IO.Class (MonadIO(..))
311−import Data.Bifunctor (first)
312229import Data.Bits (shiftR, (.|.), (.&.))
313−import Data.Functor.Identity (Identity(..))
314230import Data.Proxy (Proxy(..))
315231import Data.Word (Word8)
316232import Foreign.C.Types (CSize(..), CInt(..))
317233import Foreign.Ptr (plusPtr, minusPtr, nullPtr)
318−import Streamly.Internal.Data.MutByteArray.Type
319− ( MutByteArray(..)
320− , PinnedState(..)
234+import Streamly.Internal.Data.Unboxed
235+ ( MutableByteArray(..)
236+ , Unbox
321237 , getMutableByteArray#
322− , putSliceUnsafe
238+ , peekWith
239+ , pokeWith
240+ , sizeOf
241+ , touch
323242 )
324−import Streamly.Internal.Data.Unbox (Unbox(..))
325243import GHC.Base
326244 ( IO(..)
327245 , Int(..)
246+ , byteArrayContents#
328247 , compareByteArrays#
329248 , copyMutableByteArray#
330249 )
331250import GHC.Base (noinline)
332−import GHC.Exts (unsafeCoerce#, Addr#)
251+import GHC.Exts (unsafeCoerce#)
333252import GHC.Ptr (Ptr(..))
334253
335254import Streamly.Internal.Data.Fold.Type (Fold(..))
336255import Streamly.Internal.Data.Producer.Type (Producer (..))
337−import Streamly.Internal.Data.Stream.Type (Stream)
338−import Streamly.Internal.Data.Parser.Type (Parser (..))
339−import Streamly.Internal.Data.StreamK.Type (StreamK)
256+import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
257+import Streamly.Internal.Data.Stream.StreamK.Type (StreamK)
340258import Streamly.Internal.Data.SVar.Type (adaptState, defState)
341−import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
342259import Streamly.Internal.Data.Unfold.Type (Unfold(..))
343260import Streamly.Internal.System.IO (arrayPayloadSize, defaultChunkSize)
344261
345262import 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
349263import qualified Streamly.Internal.Data.Producer as Producer
350−import qualified Streamly.Internal.Data.Stream.Type as D
351−import qualified Streamly.Internal.Data.Stream.Lift as D
352−import qualified Streamly.Internal.Data.StreamK.Type as K
264+import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
265+import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
266+import qualified Streamly.Internal.Data.Unboxed as Unboxed
353267import qualified Prelude
354268
355269import Prelude hiding
356− (Foldable(..), concat, read, unlines, splitAt, reverse, truncate)
270+ (length, foldr, read, unlines, splitAt, reverse, truncate)
357271
358272#include "DocTestDataMutArray.hs"
359273
@@ -361,7 +275,6 @@ import Prelude hiding
361275-- Foreign helpers
362276-------------------------------------------------------------------------------
363277
364−-- NOTE: Have to be "ccall unsafe" so that we can pass unpinned memory to these
365278foreign import ccall unsafe "string.h memcpy" c_memcpy
366279 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO (Ptr Word8)
367280
@@ -371,9 +284,6 @@ foreign import ccall unsafe "string.h memchr" c_memchr
371284foreign import ccall unsafe "string.h memcmp" c_memcmp
372285 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO CInt
373286
374−foreign import ccall unsafe "string.h strlen" c_strlen
375− :: Ptr Word8 -> IO CSize
376−
377287-- | Given an 'Unboxed' type (unused first arg) and a number of bytes, return
378288-- how many elements of that type will completely fit in those bytes.
379289--
@@ -428,7 +338,7 @@ data MutArray a =
428338 -- The array is a range into arrContents. arrContents may be a superset of
429339 -- the slice represented by the array. All offsets are in bytes.
430340 MutArray
431− { arrContents :: {-# UNPACK #-} !MutByteArray
341+ { arrContents :: {-# UNPACK #-} !MutableByteArray
432342 , arrStart :: {-# UNPACK #-} !Int -- ^ index into arrContents
433343 , arrEnd :: {-# UNPACK #-} !Int -- ^ index into arrContents
434344 -- Represents the first invalid index of
@@ -440,28 +350,17 @@ data MutArray a =
440350-- Pinning & Unpinning
441351-------------------------------------------------------------------------------
442352
443−-- | Return a copy of the array in pinned memory if unpinned, else return the
444−-- original array.
445353{-# INLINE pin #-}
446354pin :: MutArray a -> IO (MutArray a)
447−pin arr@MutArray{..} =
448− if Unboxed.isPinned arrContents
449− then pure arr
450− else pinnedClone arr
355+pin arr@MutArray{..} = do
356+ contents <- Unboxed.pin arrContents
357+ return $ arr {arrContents = contents}
451358
452−-- | Return a copy of the array in unpinned memory if pinned, else return the
453−-- original array.
454359{-# INLINE unpin #-}
455360unpin :: MutArray a -> IO (MutArray a)
456−unpin arr@MutArray{..} =
457− if Unboxed.isPinned arrContents
458− then clone arr
459− else pure arr
460−
461−-- | Return 'True' if the array is allocated in pinned memory.
462−{-# INLINE isPinned #-}
463−isPinned :: MutArray a -> Bool
464−isPinned MutArray{..} = Unboxed.isPinned arrContents
361+unpin arr@MutArray{..} = do
362+ contents <- Unboxed.unpin arrContents
363+ return $ arr {arrContents = contents}
465364
466365-------------------------------------------------------------------------------
467366-- Construction
@@ -476,11 +375,9 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
476375-- files and arrays.
477376
478377-- GHC always guarantees word-aligned memory, alignment is important only when
479−-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
378+-- we need more than that. See stg_newAlignedPinnedByteArrayzh and
480379-- allocatePinned in GHC source.
481380
482−-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
483−
484381-- | @newArrayWith allocator alignment count@ allocates a new array of zero
485382-- length and with a capacity to hold @count@ elements, using @allocator
486383-- size alignment@ as the memory allocator function.
@@ -493,7 +390,7 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
493390-- /Pre-release/
494391{-# INLINE newArrayWith #-}
495392newArrayWith :: forall m a. (MonadIO m, Unbox a)
496− => (Int -> Int -> m MutByteArray) -> Int -> Int -> m (MutArray a)
393+ => (Int -> Int -> m MutableByteArray) -> Int -> Int -> m (MutArray a)
497394newArrayWith alloc alignSize count = do
498395 let size = max (count * SIZE_OF(a)) 0
499396 contents <- alloc size alignSize
@@ -504,34 +401,27 @@ newArrayWith alloc alignSize count = do
504401 , arrBound = size
505402 }
506403
507−-- For arrays "nil" sounds a bit odd. empty is better. The only problem with
508−-- empty is that it is also used by the Alternative type class. But assuming we
509−-- will mostly import the Array module qualified this should be fine.
510−
511−-- | Create an empty array.
512−empty ::
513−#ifdef DEVBUILD
514− Unbox a =>
515−#endif
516− MutArray a
517−empty = MutArray Unboxed.empty 0 0 0
518−
519−{-# DEPRECATED nil "Please use empty instead." #-}
520404nil ::
521405#ifdef DEVBUILD
522406 Unbox a =>
523407#endif
524408 MutArray a
525−nil = empty
409+nil = MutArray Unboxed.nil 0 0 0
526410
527−{-# INLINE newBytesAs #-}
528−newBytesAs :: MonadIO m =>
411+
412+-- | Allocates a pinned empty array that can hold 'count' items. The memory of
413+-- the array is uninitialized and the allocation is aligned as per the
414+-- 'Unboxed' instance of the type.
415+--
416+-- /Pre-release/
417+{-# INLINE newPinnedBytes #-}
418+newPinnedBytes :: MonadIO m =>
529419#ifdef DEVBUILD
530420 Unbox a =>
531421#endif
532− PinnedState -> Int -> m (MutArray a)
533−newBytesAs ps bytes = do
534− contents <- liftIO $ Unboxed.newBytesAs ps bytes
422+ Int -> m (MutArray a)
423+newPinnedBytes bytes = do
424+ contents <- liftIO $ Unboxed.newPinnedBytes bytes
535425 return $ MutArray
536426 { arrContents = contents
537427 , arrStart = 0
@@ -539,62 +429,52 @@ newBytesAs ps bytes = do
539429 , arrBound = bytes
540430 }
541431
542−-- | Allocates a pinned empty array that with a reserved capacity of bytes.
543−-- The memory of the array is uninitialized and the allocation is aligned as
544−-- per the 'Unboxed' instance of the type.
545−--
546−-- /Pre-release/
547−{-# INLINE pinnedNewBytes #-}
548−{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
549−pinnedNewBytes :: MonadIO m =>
550−#ifdef DEVBUILD
551− Unbox a =>
552−#endif
553− Int -> m (MutArray a)
554−pinnedNewBytes = newBytesAs Pinned
555−
556432-- | Like 'newArrayWith' but using an allocator is a pinned memory allocator and
557433-- the alignment is dictated by the 'Unboxed' instance of the type.
558434--
559435-- /Internal/
560−{-# INLINE pinnedNewAligned #-}
561−pinnedNewAligned :: (MonadIO m, Unbox a) => Int -> Int -> m (MutArray a)
562−pinnedNewAligned =
563− newArrayWith (\s a -> liftIO $ Unboxed.pinnedNewAlignedBytes s a)
564−
565−{-# INLINE newAs #-}
566−newAs :: (MonadIO m, Unbox a) => PinnedState -> Int -> m (MutArray a)
567−newAs ps =
568− newArrayWith
569− (\s _ -> liftIO $ Unboxed.newBytesAs ps s)
570− (error "new: alignment is not used in unpinned arrays.")
436+{-# INLINE newAlignedPinned #-}
437+newAlignedPinned :: (MonadIO m, Unbox a) => Int -> Int -> m (MutArray a)
438+newAlignedPinned =
439+ newArrayWith (\s a -> liftIO $ Unboxed.newAlignedPinnedBytes s a)
571440
572441-- XXX can unaligned allocation be more efficient when alignment is not needed?
573−
574−-- | Allocates a pinned array of zero length but growable to the specified
575−-- capacity without reallocation.
576−{-# INLINE pinnedEmptyOf #-}
577−pinnedEmptyOf :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
578−pinnedEmptyOf = newAs Pinned
579−
580−-- XXX Deprecate in major
581−-- {-# DEPRECATED pinnedNew "Please use pinnedEmptyOf instead." #-}
582−{-# INLINE pinnedNew #-}
583−pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
584−pinnedNew = pinnedEmptyOf
585−
586−-- | Allocates an unpinned array of zero length but growable to the specified
587−-- capacity without reallocation.
588442--
589−{-# INLINE emptyOf #-}
590−emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591−emptyOf = newAs Unpinned
443+-- | Allocates an empty pinned array that can hold 'count' items. The memory of
444+-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
445+-- instance of the type.
446+--
447+{-# INLINE newPinned #-}
448+newPinned :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
449+newPinned =
450+ newArrayWith
451+ (\s _ -> liftIO $ Unboxed.newPinnedBytes s)
452+ (error "newPinned: alignSize is not used")
592453
593−-- XXX Deprecate in major
594−-- {-# DEPRECATED new "Please use emptyOf instead." #-}
454+-- | Allocates an empty unpinned array that can hold 'count' items. The memory
455+-- of the array is uninitialized.
456+--
595457{-# INLINE new #-}
596458new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
597−new = emptyOf
459+new =
460+ newArrayWith
461+ (\s _ -> liftIO $ Unboxed.newUnpinnedBytes s)
462+ (error "new: alignment is not used in unpinned arrays.")
463+
464+-- XXX This should create a full length uninitialzed array so that the pointer
465+-- can be used.
466+
467+-- | Allocate a pinned MutArray of the given size and run an IO action passing
468+-- the array start pointer.
469+--
470+-- /Internal/
471+{-# INLINE withNewArrayUnsafe #-}
472+withNewArrayUnsafe ::
473+ (MonadIO m, Unbox a) => Int -> (Ptr a -> m ()) -> m (MutArray a)
474+withNewArrayUnsafe count f = do
475+ arr <- newPinned count
476+ asPtrUnsafe arr
477+ $ \p -> f p >> return arr
598478
599479-------------------------------------------------------------------------------
600480-- Random writes
@@ -610,7 +490,7 @@ putIndexUnsafe :: forall m a. (MonadIO m, Unbox a)
610490putIndexUnsafe i MutArray{..} x = do
611491 let index = INDEX_OF(arrStart, i, a)
612492 assert (i >= 0 && INDEX_VALID(index, arrEnd, a)) (return ())
613− liftIO $ pokeAt index arrContents x
493+ liftIO $ pokeWith arrContents index x
614494
615495invalidIndex :: String -> Int -> a
616496invalidIndex label i =
@@ -628,7 +508,7 @@ putIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m ()
628508putIndex i MutArray{..} x = do
629509 let index = INDEX_OF(arrStart,i,a)
630510 if i >= 0 && INDEX_VALID(index,arrEnd,a)
631− then liftIO $ pokeAt index arrContents x
511+ then liftIO $ pokeWith arrContents index x
632512 else invalidIndex "putIndex" i
633513
634514-- | Write an input stream of (index, value) pairs to an array. Throws an
@@ -642,21 +522,19 @@ putIndices arr = FL.foldlM' step (return ())
642522
643523 where
644524
645− step () (i, x) = putIndex i arr x
525+ step () (i, x) = liftIO (putIndex i arr x)
646526
647527-- | Modify a given index of an array using a modifier function.
648528--
649−-- Unsafe because it does not check the bounds of the array.
650−--
651529-- /Pre-release/
652530modifyIndexUnsafe :: forall m a b. (MonadIO m, Unbox a) =>
653531 Int -> MutArray a -> (a -> (a, b)) -> m b
654532modifyIndexUnsafe i MutArray{..} f = liftIO $ do
655533 let index = INDEX_OF(arrStart,i,a)
656534 assert (i >= 0 && INDEX_NEXT(index,a) <= arrEnd) (return ())
657− r <- peekAt index arrContents
535+ r <- peekWith arrContents index
658536 let (x, res) = f r
659− pokeAt index arrContents x
537+ pokeWith arrContents index x
660538 return res
661539
662540-- | Modify a given index of an array using a modifier function.
@@ -668,12 +546,13 @@ modifyIndex i MutArray{..} f = do
668546 let index = INDEX_OF(arrStart,i,a)
669547 if i >= 0 && INDEX_VALID(index,arrEnd,a)
670548 then liftIO $ do
671− r <- peekAt index arrContents
549+ r <- peekWith arrContents index
672550 let (x, res) = f r
673− pokeAt index arrContents x
551+ pokeWith arrContents index x
674552 return res
675553 else invalidIndex "modifyIndex" i
676554
555+
677556-- | Modify the array indices generated by the supplied stream.
678557--
679558-- /Pre-release/
@@ -692,8 +571,6 @@ modifyIndices arr f = FL.foldlM' step initial
692571
693572-- | Modify each element of an array using the supplied modifier function.
694573--
695−-- This is an in-place equivalent of an immutable map operation.
696−--
697574-- /Pre-release/
698575modify :: forall m a. (MonadIO m, Unbox a)
699576 => MutArray a -> (a -> a) -> m ()
@@ -704,8 +581,8 @@ modify MutArray{..} f = liftIO $
704581
705582 go i =
706583 when (INDEX_VALID(i,arrEnd,a)) $ do
707− r <- peekAt i arrContents
708− pokeAt i arrContents (f r)
584+ r <- peekWith arrContents i
585+ pokeWith arrContents i (f r)
709586 go (INDEX_NEXT(i,a))
710587
711588-- XXX We could specify the number of bytes to swap instead of Proxy. Need
@@ -714,15 +591,15 @@ modify MutArray{..} f = liftIO $
714591swapArrayByteIndices ::
715592 forall a. Unbox a
716593 => Proxy a
717− -> MutByteArray
594+ -> MutableByteArray
718595 -> Int
719596 -> Int
720597 -> IO ()
721598swapArrayByteIndices _ arrContents i1 i2 = do
722− r1 <- peekAt i1 arrContents
723− r2 <- peekAt i2 arrContents
724− pokeAt i1 arrContents (r2 :: a)
725− pokeAt i2 arrContents (r1 :: a)
599+ r1 <- peekWith arrContents i1
600+ r2 <- peekWith arrContents i2
601+ pokeWith arrContents i1 (r2 :: a)
602+ pokeWith arrContents i2 (r1 :: a)
726603
727604-- | Swap the elements at two indices without validating the indices.
728605--
@@ -838,23 +715,23 @@ arrayChunkBytes = 1024
838715roundDownTo :: Int -> Int -> Int
839716roundDownTo elemSize size = size - (size `mod` elemSize)
840717
718+-- XXX See if resizing can be implemented by reading the old array as a stream
719+-- and then using writeN to the new array.
720+--
841721-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
842722-- Since this is not inlined Unboxed consrraint leads to dictionary passing
843723-- which complicates some inspection tests.
844724--
845−{-# NOINLINE reallocExplicitAs #-}
846−reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
847−reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
725+{-# NOINLINE reallocExplicit #-}
726+reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
727+reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
848728 assertM(arrEnd <= arrBound)
849729
850730 -- Allocate new array
851731 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
852− contents <-
853− if ps == Pinned
854− then Unboxed.pinnedNew newCapMaxInBytes
855− else Unboxed.new newCapMaxInBytes
856− let !(MutByteArray mbarrFrom#) = arrContents
857− !(MutByteArray mbarrTo#) = contents
732+ contents <- Unboxed.newPinnedBytes newCapMaxInBytes
733+ let !(MutableByteArray mbarrFrom#) = arrContents
734+ !(MutableByteArray mbarrTo#) = contents
858735
859736 -- Copy old data
860737 let oldStart = arrStart
@@ -875,10 +752,6 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
875752 , arrBound = newCapInBytes
876753 }
877754
878−-- XXX Should these be called reallocBytes etc?
879−-- XXX We may also need reallocAs to allocate as pinned/unpinned explicitly. In
880−-- fact clone/pinnedClone can be implemented using reallocAs.
881−
882755-- | @realloc newCapacity array@ reallocates the array to the specified
883756-- capacity in bytes.
884757--
@@ -887,15 +760,9 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
887760-- down to multiples of array size. If the new size is more than
888761-- 'largeObjectThreshold' then it is rounded up to the block size (4K).
889762--
890−-- If the original array is pinned, the newly allocated array is also pinned.
891763{-# INLINABLE realloc #-}
892764realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
893−realloc bytes arr =
894− let ps =
895− if isPinned arr
896− then Pinned
897− else Unpinned
898− in liftIO $ reallocExplicitAs ps (SIZE_OF(a)) bytes arr
765+realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
899766
900767-- | @reallocWith label capSizer minIncrBytes array@. The label is used
901768-- in error messages and the capSizer is used to determine the capacity of the
@@ -918,14 +785,14 @@ reallocWith label capSizer minIncrBytes arr = do
918785 where
919786
920787 badSize newSize =
921− Prelude.concat
788+ concat
922789 [ label
923790 , ": new array size (in bytes) is less than required size "
924791 , show newSize
925792 , ". Please check the sizing function passed."
926793 ]
927794
928−-- | @grow newCapacity array@ changes the total capacity of the array so that
795+-- | @resize newCapacity array@ changes the total capacity of the array so that
929796-- it is enough to hold the specified number of elements. Nothing is done if
930797-- the specified capacity is less than the length of the array.
931798--
@@ -933,46 +800,34 @@ reallocWith label capSizer minIncrBytes arr = do
933800-- the block size (4K).
934801--
935802-- /Pre-release/
936−{-# INLINE grow #-}
937−grow :: forall m a. (MonadIO m, Unbox a) =>
803+{-# INLINE resize #-}
804+resize :: forall m a. (MonadIO m, Unbox a) =>
938805 Int -> MutArray a -> m (MutArray a)
939−grow nElems arr@MutArray{..} = do
806+resize nElems arr@MutArray{..} = do
940807 let req = SIZE_OF(a) * nElems
941− cap = arrBound - arrStart
942− if req < cap
808+ len = arrEnd - arrStart
809+ if req < len
943810 then return arr
944811 else realloc req arr
945812
946−{-# DEPRECATED resize "Please use grow instead." #-}
947−{-# INLINE resize #-}
948−resize :: forall m a. (MonadIO m, Unbox a) =>
949− Int -> MutArray a -> m (MutArray a)
950−resize = grow
951−
952−-- | Like 'grow' but if the requested byte capacity is more than
953−-- 'largeObjectThreshold' then it is rounded up to the closest power of 2.
813+-- | Like 'resize' but if the byte capacity is more than 'largeObjectThreshold'
814+-- then it is rounded up to the closest power of 2.
954815--
955816-- /Pre-release/
956−{-# INLINE growExp #-}
957−growExp :: forall m a. (MonadIO m, Unbox a) =>
817+{-# INLINE resizeExp #-}
818+resizeExp :: forall m a. (MonadIO m, Unbox a) =>
958819 Int -> MutArray a -> m (MutArray a)
959−growExp nElems arr@MutArray{..} = do
820+resizeExp nElems arr@MutArray{..} = do
960821 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
961822 req1 =
962823 if req > largeObjectThreshold
963824 then roundUpToPower2 req
964825 else req
965− cap = arrBound - arrStart
966− if req1 < cap
826+ len = arrEnd - arrStart
827+ if req1 < len
967828 then return arr
968829 else realloc req1 arr
969830
970−{-# DEPRECATED resizeExp "Please use growExp instead." #-}
971−{-# INLINE resizeExp #-}
972−resizeExp :: forall m a. (MonadIO m, Unbox a) =>
973− Int -> MutArray a -> m (MutArray a)
974−resizeExp = growExp
975−
976831-- | Resize the allocated memory to drop any reserved free space at the end of
977832-- the array and reallocate it to reduce wastage.
978833--
@@ -1017,7 +872,7 @@ rightSize arr@MutArray{..} = do
1017872snocNewEnd :: (MonadIO m, Unbox a) => Int -> MutArray a -> a -> m (MutArray a)
1018873snocNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1019874 assert (newEnd <= arrBound) (return ())
1020− pokeAt arrEnd arrContents x
875+ pokeWith arrContents arrEnd x
1021876 return $ arr {arrEnd = newEnd}
1022877
1023878-- | Really really unsafe, appends the element into the first array, may
@@ -1037,7 +892,7 @@ snocUnsafe arr@MutArray{..} = snocNewEnd (INDEX_NEXT(arrEnd,a)) arr
1037892{-# INLINE snocMay #-}
1038893snocMay :: forall m a. (MonadIO m, Unbox a) =>
1039894 MutArray a -> a -> m (Maybe (MutArray a))
1040−snocMay arr@MutArray{..} x = do
895+snocMay arr@MutArray{..} x = liftIO $ do
1041896 let newEnd = INDEX_NEXT(arrEnd,a)
1042897 if newEnd <= arrBound
1043898 then Just <$> snocNewEnd newEnd arr x
@@ -1051,7 +906,7 @@ snocWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1051906 -> a
1052907 -> m (MutArray a)
1053908snocWithRealloc sizer arr x = do
1054− arr1 <- reallocWith "snocWith" sizer (SIZE_OF(a)) arr
909+ arr1 <- liftIO $ reallocWith "snocWith" sizer (SIZE_OF(a)) arr
1055910 snocUnsafe arr1 x
1056911
1057912-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
@@ -1073,7 +928,7 @@ snocWith :: forall m a. (MonadIO m, Unbox a) =>
1073928 -> MutArray a
1074929 -> a
1075930 -> m (MutArray a)
1076−snocWith allocSize arr x = do
931+snocWith allocSize arr x = liftIO $ do
1077932 let newEnd = INDEX_NEXT(arrEnd arr,a)
1078933 if newEnd <= arrBound arr
1079934 then snocNewEnd newEnd arr x
@@ -1117,126 +972,6 @@ snoc = snocWith f
1117972 then oldSize * 2
1118973 else roundUpToPower2 oldSize * 2
1119974
1120−-------------------------------------------------------------------------------
1121−-- Serialization/Deserialization
1122−-------------------------------------------------------------------------------
1123−
1124−{-# INLINE pokeNewEnd #-}
1125−pokeNewEnd :: (MonadIO m, Unbox a) =>
1126− Int -> MutArray Word8 -> a -> m (MutArray Word8)
1127−pokeNewEnd newEnd arr@MutArray{..} x = liftIO $ do
1128− assert (newEnd <= arrBound) (return ())
1129− liftIO $ pokeAt arrEnd arrContents x
1130− return $ arr {arrEnd = newEnd}
1131−
1132−-- | Really really unsafe, unboxes a Haskell type and appends the resulting
1133−-- bytes to the byte array, may cause silent data corruption or if you are
1134−-- lucky a segfault if the array does not have enough space to append the
1135−-- element.
1136−--
1137−-- /Internal/
1138−{-# INLINE pokeAppendUnsafe #-}
1139−pokeAppendUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1140− MutArray Word8 -> a -> m (MutArray Word8)
1141−pokeAppendUnsafe arr@MutArray{..} = pokeNewEnd (arrEnd + SIZE_OF(a)) arr
1142−
1143−-- | Skip the specified number of bytes in the array. The data in the skipped
1144−-- region remains uninitialzed.
1145−{-# INLINE pokeSkipUnsafe #-}
1146−pokeSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1147−pokeSkipUnsafe n arr@MutArray{..} = do
1148− let newEnd = arrEnd + n
1149− in assert (newEnd <= arrBound) (arr {arrEnd = newEnd})
1150−
1151−-- | Like 'pokeAppend' but does not grow the array when pre-allocated array
1152−-- capacity becomes full.
1153−--
1154−-- /Internal/
1155−{-# INLINE pokeAppendMay #-}
1156−pokeAppendMay :: forall m a. (MonadIO m, Unbox a) =>
1157− MutArray Word8 -> a -> m (Maybe (MutArray Word8))
1158−pokeAppendMay arr@MutArray{..} x = liftIO $ do
1159− let newEnd = arrEnd + SIZE_OF(a)
1160− if newEnd <= arrBound
1161− then Just <$> pokeNewEnd newEnd arr x
1162− else return Nothing
1163−
1164−{-# NOINLINE pokeWithRealloc #-}
1165−pokeWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
1166− (Int -> Int)
1167− -> MutArray Word8
1168− -> a
1169− -> m (MutArray Word8)
1170−pokeWithRealloc sizer arr x = do
1171− arr1 <- liftIO $ reallocWith "pokeWithRealloc" sizer (SIZE_OF(a)) arr
1172− pokeAppendUnsafe arr1 x
1173−
1174−{-# INLINE pokeAppendWith #-}
1175−pokeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1176− (Int -> Int)
1177− -> MutArray Word8
1178− -> a
1179− -> m (MutArray Word8)
1180−pokeAppendWith allocSize arr x = liftIO $ do
1181− let newEnd = arrEnd arr + SIZE_OF(a)
1182− if newEnd <= arrBound arr
1183− then pokeNewEnd newEnd arr x
1184− else pokeWithRealloc allocSize arr x
1185−
1186−-- | Unbox a Haskell type and append the resulting bytes to a mutable byte
1187−-- array. The array is grown exponentially when more space is needed.
1188−--
1189−-- Definition:
1190−--
1191−-- >>> pokeAppend arr x = MutArray.castUnsafe <$> MutArray.snoc (MutArray.castUnsafe arr) x
1192−--
1193−{-# INLINE pokeAppend #-}
1194−pokeAppend :: forall m a. (MonadIO m, Unbox a) =>
1195− MutArray Word8 -> a -> m (MutArray Word8)
1196−pokeAppend = pokeAppendWith f
1197−
1198− where
1199−
1200− f oldSize =
1201− if isPower2 oldSize
1202− then oldSize * 2
1203− else roundUpToPower2 oldSize * 2
1204−
1205−-- | Really really unsafe, create a Haskell value from an unboxed byte array,
1206−-- does not check if the array is big enough, may return garbage or if you are
1207−-- lucky may cause a segfault.
1208−--
1209−-- /Internal/
1210−{-# INLINE peekUnconsUnsafe #-}
1211−peekUnconsUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1212− MutArray Word8 -> m (a, MutArray Word8)
1213−peekUnconsUnsafe MutArray{..} = do
1214− let start1 = arrStart + SIZE_OF(a)
1215− assert (start1 <= arrEnd) (return ())
1216− liftIO $ do
1217− r <- peekAt arrStart arrContents
1218− return (r, MutArray arrContents start1 arrEnd arrBound)
1219−
1220−-- | Discard the specified number of bytes in the array.
1221−{-# INLINE peekSkipUnsafe #-}
1222−peekSkipUnsafe :: Int -> MutArray Word8 -> MutArray Word8
1223−peekSkipUnsafe n MutArray{..} =
1224− let start1 = arrStart + n
1225− in assert (start1 <= arrEnd) (MutArray arrContents start1 arrEnd arrBound)
1226−
1227−-- | Create a Haskell value from its unboxed representation from the head of a
1228−-- byte array, return the value and the remaining array.
1229−{-# INLINE peekUncons #-}
1230−peekUncons :: forall m a. (MonadIO m, Unbox a) =>
1231− MutArray Word8 -> m (Maybe a, MutArray Word8)
1232−peekUncons arr@MutArray{..} = do
1233− let start1 = arrStart + SIZE_OF(a)
1234− if start1 > arrEnd
1235− then return (Nothing, arr)
1236− else liftIO $ do
1237− r <- peekAt arrStart arrContents
1238− return (Just r, MutArray arrContents start1 arrEnd arrBound)
1239−
1240975-------------------------------------------------------------------------------
1241976-- Random reads
1242977-------------------------------------------------------------------------------
@@ -1251,17 +986,17 @@ getIndexUnsafe :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
1251986getIndexUnsafe i MutArray{..} = do
1252987 let index = INDEX_OF(arrStart,i,a)
1253988 assert (i >= 0 && INDEX_VALID(index,arrEnd,a)) (return ())
1254− liftIO $ peekAt index arrContents
989+ liftIO $ peekWith arrContents index
1255990
1256991-- | /O(1)/ Lookup the element at the given index. Index starts from 0.
1257992--
1258993{-# INLINE getIndex #-}
1259−getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (Maybe a)
994+getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
1260995getIndex i MutArray{..} = do
1261996 let index = INDEX_OF(arrStart,i,a)
1262997 if i >= 0 && INDEX_VALID(index,arrEnd,a)
1263− then liftIO $ Just <$> peekAt index arrContents
1264− else return Nothing
998+ then liftIO $ peekWith arrContents index
999+ else invalidIndex "getIndex" i
12651000
12661001-- | /O(1)/ Lookup the element at the given index from the end of the array.
12671002-- Index starts from 0.
@@ -1273,16 +1008,21 @@ getIndexRev :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a
12731008getIndexRev i MutArray{..} = do
12741009 let index = RINDEX_OF(arrEnd,i,a)
12751010 if i >= 0 && index >= arrStart
1276− then liftIO $ peekAt index arrContents
1011+ then liftIO $ peekWith arrContents index
12771012 else invalidIndex "getIndexRev" i
12781013
12791014data GetIndicesState contents start end st =
12801015 GetIndicesState contents start end st
12811016
1282−{-# INLINE indexReaderWith #-}
1283−indexReaderWith :: (Monad m, Unbox a) =>
1017+-- | Given an unfold that generates array indices, read the elements on those
1018+-- indices from the supplied MutArray. An error is thrown if an index is out of
1019+-- bounds.
1020+--
1021+-- /Pre-release/
1022+{-# INLINE getIndicesD #-}
1023+getIndicesD :: (Monad m, Unbox a) =>
12841024 (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
1025+getIndicesD liftio (D.Stream stepi sti) = Unfold step inject
12861026
12871027 where
12881028
@@ -1295,32 +1035,13 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
12951035 case r of
12961036 D.Yield i s -> do
12971037 x <- liftio $ getIndex i (MutArray contents start end undefined)
1298− case x of
1299− Just v -> return $ D.Yield v (GetIndicesState contents start end s)
1300− Nothing -> error "Invalid Index"
1038+ return $ D.Yield x (GetIndicesState contents start end s)
13011039 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)
13021040 D.Stop -> return D.Stop
13031041
1304−{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1305−{-# INLINE getIndicesWith #-}
1306−getIndicesWith :: (Monad m, Unbox a) =>
1307− (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1308−getIndicesWith = indexReaderWith
1309−
1310−-- | Given an unfold that generates array indices, read the elements on those
1311−-- indices from the supplied MutArray. An error is thrown if an index is out of
1312−-- bounds.
1313−--
1314−-- /Pre-release/
1315−{-# INLINE indexReader #-}
1316−indexReader :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1317−indexReader = indexReaderWith liftIO
1318−
1319−-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1320−{-# DEPRECATED getIndices "Please use indexReader instead." #-}
13211042{-# INLINE getIndices #-}
13221043getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1323−getIndices = indexReader
1044+getIndices = getIndicesD liftIO
13241045
13251046-------------------------------------------------------------------------------
13261047-- Subarrays
@@ -1425,7 +1146,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14251146
14261147 -- Invariant low < high on entry, and on return as well
14271148 moveHigh low high = do
1428− h <- peekAt high arrContents
1149+ h <- peekWith arrContents high
14291150 if f h
14301151 then
14311152 -- Correctly classified, continue the loop
@@ -1445,7 +1166,7 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14451166 -- low <= high
14461167 -- Both low and high are valid locations within the array
14471168 go low high = do
1448− l <- peekAt low arrContents
1169+ l <- peekWith arrContents low
14491170 if f l
14501171 then
14511172 -- low is wrongly classified
@@ -1456,8 +1177,8 @@ partitionBy f arr@MutArray{..} = liftIO $ do
14561177 case r of
14571178 Nothing -> return low
14581179 Just (high1, h) -> do -- low < high1
1459− pokeAt low arrContents h
1460− pokeAt high1 arrContents l
1180+ pokeWith arrContents low h
1181+ pokeWith arrContents high1 l
14611182 let low1 = INDEX_NEXT(low,a)
14621183 high2 = INDEX_PREV(high1,a)
14631184 if low1 <= high2
@@ -1569,10 +1290,20 @@ data GroupState s contents start end bound
15691290 contents start end bound (GroupState s contents start end bound)
15701291 | GroupFinish
15711292
1572−{-# INLINE_NORMAL chunksOfAs #-}
1573−chunksOfAs :: forall m a. (MonadIO m, Unbox a)
1574− => PinnedState -> Int -> D.Stream m a -> D.Stream m (MutArray a)
1575−chunksOfAs ps n (D.Stream step state) =
1293+-- | @chunksOf n stream@ groups the input stream into a stream of
1294+-- arrays of size n.
1295+--
1296+-- @chunksOf n = StreamD.foldMany (MutArray.writeN n)@
1297+--
1298+-- /Pre-release/
1299+{-# INLINE_NORMAL chunksOf #-}
1300+chunksOf :: forall m a. (MonadIO m, Unbox a)
1301+ => Int -> D.Stream m a -> D.Stream m (MutArray a)
1302+-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1303+-- benchmark. It seems it has difficulty producing optimized code when
1304+-- converting to StreamK. Investigate GHC optimizations.
1305+-- chunksOf n = D.foldMany (writeN n)
1306+chunksOf n (D.Stream step state) =
15761307 D.Stream step' (GroupStart state)
15771308
15781309 where
@@ -1584,14 +1315,14 @@ chunksOfAs ps n (D.Stream step state) =
15841315 error $ "Streamly.Internal.Data.MutArray.Mut.Type.chunksOf: "
15851316 ++ "the size of arrays [" ++ show n
15861317 ++ "] must be a natural number"
1587− (MutArray contents start end bound :: MutArray a) <- newAs ps n
1318+ (MutArray contents start end bound :: MutArray a) <- liftIO $ newPinned n
15881319 return $ D.Skip (GroupBuffer st contents start end bound)
15891320
15901321 step' gst (GroupBuffer st contents start end bound) = do
15911322 r <- step (adaptState gst) st
15921323 case r of
15931324 D.Yield x s -> do
1594− liftIO $ pokeAt end contents x
1325+ liftIO $ pokeWith contents end x
15951326 let end1 = INDEX_NEXT(end,a)
15961327 return $
15971328 if end1 >= bound
@@ -1610,51 +1341,14 @@ chunksOfAs ps n (D.Stream step state) =
16101341
16111342 step' _ GroupFinish = return D.Stop
16121343
1613−-- | @chunksOf n stream@ groups the elements in the input stream into arrays of
1614−-- @n@ elements each.
1615−--
1616−-- Same as the following but may be more efficient:
1617−--
1618−-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
1619−--
1620−-- /Pre-release/
1621−{-# INLINE_NORMAL chunksOf #-}
1622−chunksOf :: forall m a. (MonadIO m, Unbox a)
1623− => Int -> D.Stream m a -> D.Stream m (MutArray a)
1624−-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1625−-- benchmark. It seems it has difficulty producing optimized code when
1626−-- converting to StreamK. Investigate GHC optimizations.
1627−-- chunksOf n = D.foldMany (createOf n)
1628−chunksOf = chunksOfAs Unpinned
1629−
1630−-- | Like 'chunksOf' but creates pinned arrays.
1631−{-# INLINE_NORMAL pinnedChunksOf #-}
1632−pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1633− => Int -> D.Stream m a -> D.Stream m (MutArray a)
1634−-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
1635−pinnedChunksOf = chunksOfAs Pinned
1636−
1637−-- | When we are buffering a stream of unknown size into an array we do not
1638−-- know how much space to pre-allocate. So we start with the min size and emit
1639−-- the array then keep on doubling the size every time. Thus we do not need to
1640−-- guess the optimum chunk size.
1641−--
1642−-- We can incorporate this in chunksOfAs if the additional size parameter does
1643−-- not impact perf.
1644−--
1645−{-# INLINE _chunksOfRange #-}
1646−_chunksOfRange :: -- (MonadIO m, Unbox a) =>
1647− PinnedState -> Int -> Int -> D.Stream m a -> D.Stream m (MutArray a)
1648−_chunksOfRange _ps _low _hi = undefined
1649−
16501344-- XXX buffer to a list instead?
16511345-- | Buffer the stream into arrays in memory.
1652−{-# INLINE arrayStreamKFromStreamDAs #-}
1653−arrayStreamKFromStreamDAs :: forall m a. (MonadIO m, Unbox a) =>
1654− PinnedState -> D.Stream m a -> m (StreamK m (MutArray a))
1655−arrayStreamKFromStreamDAs ps =
1346+{-# INLINE arrayStreamKFromStreamD #-}
1347+arrayStreamKFromStreamD :: forall m a. (MonadIO m, Unbox a) =>
1348+ D.Stream m a -> m (StreamK m (MutArray a))
1349+arrayStreamKFromStreamD =
16561350 let n = allocBytesToElemCount (undefined :: a) defaultChunkSize
1657− in D.foldr K.cons K.nil . chunksOfAs ps n
1351+ in D.foldr K.cons K.nil . chunksOf n
16581352
16591353-------------------------------------------------------------------------------
16601354-- Streams of arrays - Flattening
@@ -1664,10 +1358,16 @@ data FlattenState s contents a =
16641358 OuterLoop s
16651359 | InnerLoop s contents !Int !Int
16661360
1667−{-# INLINE_NORMAL concatWith #-}
1668−concatWith :: forall m a. (Monad m, Unbox a)
1669− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1670−concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1361+-- | Use the "reader" unfold instead.
1362+--
1363+-- @flattenArrays = unfoldMany reader@
1364+--
1365+-- We can try this if there are any fusion issues in the unfold.
1366+--
1367+{-# INLINE_NORMAL flattenArrays #-}
1368+flattenArrays :: forall m a. (MonadIO m, Unbox a)
1369+ => D.Stream m (MutArray a) -> D.Stream m a
1370+flattenArrays (D.Stream step state) = D.Stream step' (OuterLoop state)
16711371
16721372 where
16731373
@@ -1684,30 +1384,19 @@ concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
16841384 return $ D.Skip $ OuterLoop st
16851385
16861386 step' _ (InnerLoop st contents p end) = do
1687− x <- liftio $ peekAt p contents
1387+ x <- liftIO $ peekWith contents p
16881388 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
16891389
1690−-- | Use the "reader" unfold instead.
1390+-- | Use the "readerRev" unfold instead.
16911391--
1692−-- @concat = unfoldMany reader@
1392+-- @flattenArrays = unfoldMany readerRev@
16931393--
16941394-- We can try this if there are any fusion issues in the unfold.
16951395--
1696−{-# INLINE_NORMAL concat #-}
1697−concat :: forall m a. (MonadIO m, Unbox a)
1698− => D.Stream m (MutArray a) -> D.Stream m a
1699−concat = concatWith liftIO
1700−
1701−{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1702−{-# INLINE flattenArrays #-}
1703−flattenArrays :: forall m a. (MonadIO m, Unbox a)
1396+{-# INLINE_NORMAL flattenArraysRev #-}
1397+flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
17041398 => D.Stream m (MutArray a) -> D.Stream m a
1705−flattenArrays = concat
1706−
1707−{-# INLINE_NORMAL concatRevWith #-}
1708−concatRevWith :: forall m a. (Monad m, Unbox a)
1709− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1710−concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1399+flattenArraysRev (D.Stream step state) = D.Stream step' (OuterLoop state)
17111400
17121401 where
17131402
@@ -1725,33 +1414,16 @@ concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
17251414 return $ D.Skip $ OuterLoop st
17261415
17271416 step' _ (InnerLoop st contents p start) = do
1728− x <- liftio $ peekAt p contents
1417+ x <- liftIO $ peekWith contents p
17291418 let cur = INDEX_PREV(p,a)
17301419 return $ D.Yield x (InnerLoop st contents cur start)
17311420
1732−-- | Use the "readerRev" unfold instead.
1733−--
1734−-- @concat = unfoldMany readerRev@
1735−--
1736−-- We can try this if there are any fusion issues in the unfold.
1737−--
1738−{-# INLINE_NORMAL concatRev #-}
1739−concatRev :: forall m a. (MonadIO m, Unbox a)
1740− => D.Stream m (MutArray a) -> D.Stream m a
1741−concatRev = concatRevWith liftIO
1742−
1743−{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1744−{-# INLINE flattenArraysRev #-}
1745−flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1746− => D.Stream m (MutArray a) -> D.Stream m a
1747−flattenArraysRev = concatRev
1748−
17491421-------------------------------------------------------------------------------
17501422-- Unfolds
17511423-------------------------------------------------------------------------------
17521424
17531425data ArrayUnsafe a = ArrayUnsafe
1754− {-# UNPACK #-} !MutByteArray -- contents
1426+ {-# UNPACK #-} !MutableByteArray -- contents
17551427 {-# UNPACK #-} !Int -- index 1
17561428 {-# UNPACK #-} !Int -- index 2
17571429
@@ -1781,7 +1453,7 @@ producerWith liftio = Producer step (return . toArrayUnsafe) extract
17811453 -- few actions for correctness and execution order sanity. We want
17821454 -- the peek to occur right here and not lazily at some later point
17831455 -- because we want the peek to be ordered with respect to the touch.
1784− !x <- liftio $ peekAt cur contents
1456+ !x <- liftio $ peekWith contents cur
17851457 return $ D.Yield x (ArrayUnsafe contents (INDEX_NEXT(cur,a)) end)
17861458
17871459 extract = return . fromArrayUnsafe
@@ -1812,7 +1484,7 @@ readerRevWith liftio = Unfold step inject
18121484 {-# INLINE_LATE step #-}
18131485 step (ArrayUnsafe _ start p) | p < start = return D.Stop
18141486 step (ArrayUnsafe contents start p) = do
1815− !x <- liftio $ peekAt p contents
1487+ !x <- liftio $ peekWith contents p
18161488 return $ D.Yield x (ArrayUnsafe contents start (INDEX_PREV(p,a)))
18171489
18181490-- | Unfold an array into a stream in reverse order.
@@ -1843,7 +1515,7 @@ toListFB c n MutArray{..} = go arrStart
18431515 -- evaluated/written to before we peek at them.
18441516 -- XXX
18451517 let !x = unsafeInlineIO $ do
1846− r <- peekAt arrContents p
1518+ r <- peekWith arrContents p
18471519 return r
18481520 in c x (go (PTR_NEXT(p,a)))
18491521-}
@@ -1860,30 +1532,31 @@ toList MutArray{..} = liftIO $ go arrStart
18601532
18611533 go p | assert (p <= arrEnd) (p == arrEnd) = return []
18621534 go p = do
1863− x <- peekAt p arrContents
1535+ x <- peekWith arrContents p
18641536 (:) x <$> go (INDEX_NEXT(p,a))
18651537
1866−{-# INLINE_NORMAL toStreamWith #-}
1867−toStreamWith ::
1538+{-# INLINE_NORMAL toStreamDWith #-}
1539+toStreamDWith ::
18681540 forall m a. (Monad m, Unbox a)
18691541 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1870−toStreamWith liftio MutArray{..} = D.Stream step arrStart
1542+toStreamDWith liftio MutArray{..} = D.Stream step arrStart
18711543
18721544 where
18731545
18741546 {-# INLINE_LATE step #-}
18751547 step _ p | assert (p <= arrEnd) (p == arrEnd) = return D.Stop
18761548 step _ p = liftio $ do
1877− r <- peekAt p arrContents
1549+ r <- peekWith arrContents p
18781550 return $ D.Yield r (INDEX_NEXT(p,a))
18791551
1880−-- | Convert a 'MutArray' into a stream.
1552+-- | Use the 'reader' unfold instead.
18811553--
1882−-- >>> read = Stream.unfold MutArray.reader
1554+-- @toStreamD = D.unfold reader@
18831555--
1884−{-# INLINE_NORMAL read #-}
1885−read :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1886−read = toStreamWith liftIO
1556+-- We can try this if the unfold has any performance issues.
1557+{-# INLINE_NORMAL toStreamD #-}
1558+toStreamD :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1559+toStreamD = toStreamDWith liftIO
18871560
18881561{-# INLINE toStreamKWith #-}
18891562toStreamKWith ::
@@ -1895,18 +1568,18 @@ toStreamKWith liftio MutArray{..} = go arrStart
18951568
18961569 go p | assert (p <= arrEnd) (p == arrEnd) = K.nil
18971570 | otherwise =
1898− let elemM = peekAt p arrContents
1571+ let elemM = peekWith arrContents p
18991572 in liftio elemM `K.consM` go (INDEX_NEXT(p,a))
19001573
19011574{-# INLINE toStreamK #-}
19021575toStreamK :: forall m a. (MonadIO m, Unbox a) => MutArray a -> StreamK m a
19031576toStreamK = toStreamKWith liftIO
19041577
1905−{-# INLINE_NORMAL toStreamRevWith #-}
1906−toStreamRevWith ::
1578+{-# INLINE_NORMAL toStreamDRevWith #-}
1579+toStreamDRevWith ::
19071580 forall m a. (Monad m, Unbox a)
19081581 => (forall b. IO b -> m b) -> MutArray a -> D.Stream m a
1909−toStreamRevWith liftio MutArray{..} =
1582+toStreamDRevWith liftio MutArray{..} =
19101583 let p = INDEX_PREV(arrEnd,a)
19111584 in D.Stream step p
19121585
@@ -1915,16 +1588,17 @@ toStreamRevWith liftio MutArray{..} =
19151588 {-# INLINE_LATE step #-}
19161589 step _ p | p < arrStart = return D.Stop
19171590 step _ p = liftio $ do
1918− r <- peekAt p arrContents
1591+ r <- peekWith arrContents p
19191592 return $ D.Yield r (INDEX_PREV(p,a))
19201593
1921−-- | Convert a 'MutArray' into a stream in reverse order.
1594+-- | Use the 'readerRev' unfold instead.
19221595--
1923−-- >>> readRev = Stream.unfold MutArray.readerRev
1596+-- @toStreamDRev = D.unfold readerRev@
19241597--
1925−{-# INLINE_NORMAL readRev #-}
1926−readRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1927−readRev = toStreamRevWith liftIO
1598+-- We can try this if the unfold has any perf issues.
1599+{-# INLINE_NORMAL toStreamDRev #-}
1600+toStreamDRev :: forall m a. (MonadIO m, Unbox a) => MutArray a -> D.Stream m a
1601+toStreamDRev = toStreamDRevWith liftIO
19281602
19291603{-# INLINE toStreamKRevWith #-}
19301604toStreamKRevWith ::
@@ -1938,7 +1612,7 @@ toStreamKRevWith liftio MutArray {..} =
19381612
19391613 go p | p < arrStart = K.nil
19401614 | otherwise =
1941− let elemM = peekAt p arrContents
1615+ let elemM = peekWith arrContents p
19421616 in liftio elemM `K.consM` go (INDEX_PREV(p,a))
19431617
19441618{-# INLINE toStreamKRev #-}
@@ -1955,12 +1629,12 @@ toStreamKRev = toStreamKRevWith liftIO
19551629-- | Strict left fold of an array.
19561630{-# INLINE_NORMAL foldl' #-}
19571631foldl' :: (MonadIO m, Unbox a) => (b -> a -> b) -> b -> MutArray a -> m b
1958−foldl' f z arr = D.foldl' f z $ read arr
1632+foldl' f z arr = D.foldl' f z $ toStreamD arr
19591633
19601634-- | Right fold of an array.
19611635{-# INLINE_NORMAL foldr #-}
19621636foldr :: (MonadIO m, Unbox a) => (a -> b -> b) -> b -> MutArray a -> m b
1963−foldr f z arr = D.foldr f z $ read arr
1637+foldr f z arr = D.foldr f z $ toStreamD arr
19641638
19651639-------------------------------------------------------------------------------
19661640-- Folds
@@ -1973,7 +1647,7 @@ foldr f z arr = D.foldr f z $ read arr
19731647
19741648-- XXX Keep the bound intact to not lose any free space? Perf impact?
19751649
1976−-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
1650+-- | @writeAppendNUnsafe n alloc@ appends up to @n@ input items to the supplied
19771651-- array.
19781652--
19791653-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1982,12 +1656,13 @@ foldr f z arr = D.foldr f z $ read arr
19821656-- Any free space left in the array after appending @n@ elements is lost.
19831657--
19841658-- /Internal/
1985−{-# INLINE_NORMAL unsafeAppendN #-}
1986−unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1659+{-# INLINE_NORMAL writeAppendNUnsafe #-}
1660+writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
19871661 Int
19881662 -> m (MutArray a)
19891663 -> Fold m a (MutArray a)
1990−unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
1664+writeAppendNUnsafe n action =
1665+ fmap fromArrayUnsafe $ FL.foldlM' step initial
19911666
19921667 where
19931668
@@ -2000,59 +1675,38 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
20001675 -- otherwise we lose that space.
20011676 arr1 <-
20021677 if free < needed
2003− then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
1678+ then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
20041679 else return arr
20051680 return $ toArrayUnsafe arr1
20061681
20071682 step (ArrayUnsafe contents start end) x = do
2008− liftIO $ pokeAt end contents x
1683+ liftIO $ pokeWith contents end x
20091684 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
20101685
2011−{-# DEPRECATED writeAppendNUnsafe "Please use unsafeAppendN instead." #-}
2012−{-# INLINE writeAppendNUnsafe #-}
2013−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
2014− Int
2015− -> m (MutArray a)
2016− -> Fold m a (MutArray a)
2017−writeAppendNUnsafe = unsafeAppendN
2018−
20191686-- | Append @n@ elements to an existing array. Any free space left in the array
20201687-- after appending @n@ elements is lost.
20211688--
2022−-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
1689+-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
20231690--
2024−{-# INLINE_NORMAL appendN #-}
2025−appendN :: forall m a. (MonadIO m, Unbox a) =>
2026− Int -> m (MutArray a) -> Fold m a (MutArray a)
2027−appendN n initial = FL.take n (unsafeAppendN n initial)
2028−
2029−-- XXX Deprecate in major
2030−-- {-# DEPRECATED writeAppendN "Please use appendN instead." #-}
2031−{-# INLINE writeAppendN #-}
1691+{-# INLINE_NORMAL writeAppendN #-}
20321692writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
20331693 Int -> m (MutArray a) -> Fold m a (MutArray a)
2034−writeAppendN = appendN
1694+writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
20351695
2036−-- | @appendWith realloc action@ mutates the array generated by @action@ to
1696+-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
20371697-- append the input stream. If there is no reserved space available in the
20381698-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
20391699-- where @oldSize@ is the current size of the array in bytes.
20401700--
20411701-- Note that the returned array may be a mutated version of original array.
20421702--
2043−-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
1703+-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
20441704--
20451705-- /Pre-release/
2046−{-# INLINE appendWith #-}
2047−appendWith :: forall m a. (MonadIO m, Unbox a) =>
2048− (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2049−appendWith sizer = FL.foldlM' (snocWith sizer)
2050−
2051−{-# DEPRECATED writeAppendWith "Please use appendWith instead." #-}
20521706{-# INLINE writeAppendWith #-}
20531707writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
20541708 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2055−writeAppendWith = appendWith
1709+writeAppendWith sizer = FL.foldlM' (snocWith sizer)
20561710
20571711-- | @append action@ mutates the array generated by @action@ to append the
20581712-- input stream. If there is no reserved space available in the array it is
@@ -2060,144 +1714,72 @@ writeAppendWith = appendWith
20601714--
20611715-- Note that the returned array may be a mutated version of original array.
20621716--
2063−-- >>> append = MutArray.appendWith (* 2)
1717+-- >>> writeAppend = MutArray.writeAppendWith (* 2)
20641718--
2065−{-# INLINE append #-}
2066−append :: forall m a. (MonadIO m, Unbox a) =>
2067− m (MutArray a) -> Fold m a (MutArray a)
2068−append = appendWith (* 2)
2069−
2070−-- XXX Deprecate in major
2071−-- {-# DEPRECATED writeAppend "Please use append instead." #-}
20721719{-# INLINE writeAppend #-}
20731720writeAppend :: forall m a. (MonadIO m, Unbox a) =>
20741721 m (MutArray a) -> Fold m a (MutArray a)
2075−writeAppend = append
1722+writeAppend = writeAppendWith (* 2)
20761723
20771724-- XXX We can carry bound as well in the state to make sure we do not lose the
20781725-- remaining capacity. Need to check perf impact.
20791726--
2080−-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
2081−-- function as argument.
1727+-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
1728+-- as argument.
20821729--
2083−-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
1730+-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
20841731--
20851732-- /Pre-release/
2086−{-# INLINE_NORMAL unsafeCreateOfWith #-}
2087−unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
1733+{-# INLINE_NORMAL writeNWithUnsafe #-}
1734+writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
20881735 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2089−unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
1736+writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
20901737
20911738 where
20921739
20931740 initial = toArrayUnsafe <$> alloc (max n 0)
20941741
20951742 step (ArrayUnsafe contents start end) x = do
2096− liftIO $ pokeAt end contents x
1743+ liftIO $ pokeWith contents end x
20971744 return
20981745 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
20991746
2100−{-# DEPRECATED writeNWithUnsafe "Please use unsafeCreateOfWith instead." #-}
2101−{-# INLINE writeNWithUnsafe #-}
2102−writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2103− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2104−writeNWithUnsafe = unsafeCreateOfWith
2105−
2106−{-# INLINE_NORMAL writeNUnsafeAs #-}
2107−writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
2108− => PinnedState -> Int -> Fold m a (MutArray a)
2109−writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
2110−
2111−-- | Like 'createOf' but does not check the array bounds when writing. The fold
1747+-- | Like 'writeN' but does not check the array bounds when writing. The fold
21121748-- driver must not call the step function more than 'n' times otherwise it will
21131749-- corrupt the memory and crash. This function exists mainly because any
21141750-- conditional in the step function blocks fusion causing 10x performance
21151751-- slowdown.
21161752--
2117−-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
1753+-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.newPinned
21181754--
2119−{-# INLINE_NORMAL unsafeCreateOf #-}
2120−unsafeCreateOf :: forall m a. (MonadIO m, Unbox a)
2121− => Int -> Fold m a (MutArray a)
2122−unsafeCreateOf = writeNUnsafeAs Unpinned
2123−
2124−{-# DEPRECATED writeNUnsafe "Please use unsafeCreateOf instead." #-}
2125−{-# INLINE writeNUnsafe #-}
1755+{-# INLINE_NORMAL writeNUnsafe #-}
21261756writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
21271757 => Int -> Fold m a (MutArray a)
2128−writeNUnsafe = unsafeCreateOf
2129−
2130−-- | Like 'unsafeCreateOf' but creates a pinned array.
2131−{-# INLINE_NORMAL unsafePinnedCreateOf #-}
2132−unsafePinnedCreateOf :: forall m a. (MonadIO m, Unbox a)
2133− => Int -> Fold m a (MutArray a)
2134−unsafePinnedCreateOf = writeNUnsafeAs Pinned
1758+writeNUnsafe = writeNWithUnsafe newPinned
21351759
2136−{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
2137−{-# INLINE pinnedWriteNUnsafe #-}
2138−pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
2139− => Int -> Fold m a (MutArray a)
2140−pinnedWriteNUnsafe = unsafePinnedCreateOf
2141−
2142−-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
1760+-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
21431761-- allocated using the @alloc@ function.
21441762--
2145−-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
2146−-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
1763+-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
1764+-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
21471765--
2148−{-# INLINE_NORMAL createOfWith #-}
2149−createOfWith :: forall m a. (MonadIO m, Unbox a)
2150− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2151−createOfWith alloc n = FL.take n (unsafeCreateOfWith alloc n)
2152−
2153−-- {-# DEPRECATED writeNWith "Please use createOfWith instead." #-}
2154−{-# INLINE writeNWith #-}
1766+{-# INLINE_NORMAL writeNWith #-}
21551767writeNWith :: forall m a. (MonadIO m, Unbox a)
21561768 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2157−writeNWith = createOfWith
1769+writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
21581770
2159−{-# INLINE_NORMAL writeNAs #-}
2160−writeNAs ::
2161− forall m a. (MonadIO m, Unbox a)
2162− => PinnedState
2163− -> Int
2164− -> Fold m a (MutArray a)
2165−writeNAs ps = createOfWith (newAs ps)
2166−
2167−-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
1771+-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
21681772-- 'MutArray'.
21691773--
2170−-- >>> createOf = MutArray.createOfWith MutArray.new
2171−-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
2172−-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
1774+-- >>> writeN = MutArray.writeNWith MutArray.newPinned
1775+-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
1776+-- >>> writeN n = MutArray.writeAppendN n (MutArray.newPinned n)
21731777--
2174−{-# INLINE_NORMAL createOf #-}
2175−createOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2176−createOf = writeNAs Unpinned
2177−
2178−-- XXX Deprecate in major
2179−-- {-# DEPRECATED writeN "Please use createOf instead." #-}
2180−{-# INLINE writeN #-}
1778+{-# INLINE_NORMAL writeN #-}
21811779writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2182−writeN = createOf
2183−
2184−-- | Like 'createOf' but creates a pinned array.
2185−{-# INLINE_NORMAL pinnedCreateOf #-}
2186−pinnedCreateOf ::
2187− forall m a. (MonadIO m, Unbox a)
2188− => Int
2189− -> Fold m a (MutArray a)
2190−pinnedCreateOf = writeNAs Pinned
2191−
2192−{-# DEPRECATED pinnedWriteN "Please use pinnedCreateOf instead." #-}
2193−{-# INLINE pinnedWriteN #-}
2194−pinnedWriteN ::
2195− forall m a. (MonadIO m, Unbox a)
2196− => Int
2197− -> Fold m a (MutArray a)
2198−pinnedWriteN = pinnedCreateOf
1780+writeN = writeNWith newPinned
21991781
2200−-- | Like unsafeCreateOfWith but writes the array in reverse order.
1782+-- | Like writeNWithUnsafe but writes the array in reverse order.
22011783--
22021784-- /Internal/
22031785{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -2214,11 +1796,11 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
22141796
22151797 step (ArrayUnsafe contents start end) x = do
22161798 let ptr = INDEX_PREV(start,a)
2217− liftIO $ pokeAt ptr contents x
1799+ liftIO $ pokeWith contents ptr x
22181800 return
22191801 $ ArrayUnsafe contents ptr end
22201802
2221−-- | Like createOfWith but writes the array in reverse order.
1803+-- | Like writeNWith but writes the array in reverse order.
22221804--
22231805-- /Internal/
22241806{-# INLINE_NORMAL writeRevNWith #-}
@@ -2226,36 +1808,31 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
22261808 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
22271809writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
22281810
2229−-- | Like 'createOf' but writes the array in reverse order.
1811+-- | Like writeN but writes the array in reverse order.
22301812--
22311813-- /Pre-release/
2232−{-# INLINE_NORMAL revCreateOf #-}
2233−revCreateOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2234−revCreateOf = writeRevNWith new
2235−
2236−{-# DEPRECATED writeRevN "Please use revCreateOf instead." #-}
2237−{-# INLINE writeRevN #-}
1814+{-# INLINE_NORMAL writeRevN #-}
22381815writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2239−writeRevN = revCreateOf
1816+writeRevN = writeRevNWith newPinned
22401817
2241−-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
2242−-- input stream to a 'MutArray' aligned to the given size.
1818+-- | @writeNAligned align n@ folds a maximum of @n@ elements from the input
1819+-- stream to a 'MutArray' aligned to the given size.
22431820--
2244−-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
2245−-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
1821+-- >>> writeNAligned align = MutArray.writeNWith (MutArray.newAlignedPinned align)
1822+-- >>> writeNAligned align n = MutArray.writeAppendN n (MutArray.newAlignedPinned align n)
22461823--
22471824-- /Pre-release/
22481825--
2249−{-# INLINE_NORMAL pinnedWriteNAligned #-}
2250−pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
1826+{-# INLINE_NORMAL writeNAligned #-}
1827+writeNAligned :: forall m a. (MonadIO m, Unbox a)
22511828 => Int -> Int -> Fold m a (MutArray a)
2252−pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
1829+writeNAligned align = writeNWith (newAlignedPinned align)
22531830
22541831-- XXX Buffer to a list instead?
2255−
1832+--
22561833-- | Buffer a stream into a stream of arrays.
22571834--
2258−-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
1835+-- >>> writeChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
22591836--
22601837-- Breaking an array into an array stream can be useful to consume a large
22611838-- array sequentially such that memory of the array is released incrementatlly.
@@ -2264,43 +1841,14 @@ pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
22641841--
22651842-- /Unimplemented/
22661843--
2267−{-# INLINE_NORMAL buildChunks #-}
2268−buildChunks :: (MonadIO m, Unbox a) =>
2269− Int -> Fold m a (StreamK n (MutArray a))
2270−buildChunks n = FL.many (createOf n) FL.toStreamK
2271−
2272−{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273−{-# INLINE writeChunks #-}
1844+{-# INLINE_NORMAL writeChunks #-}
22741845writeChunks :: (MonadIO m, Unbox a) =>
22751846 Int -> Fold m a (StreamK n (MutArray a))
2276−writeChunks = buildChunks
2277−
2278−{-# INLINE_NORMAL writeWithAs #-}
2279−writeWithAs :: forall m a. (MonadIO m, Unbox a)
2280− => PinnedState -> Int -> Fold m a (MutArray a)
2281−-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
2282−writeWithAs ps elemCount =
2283− FL.rmapM extract $ FL.foldlM' step initial
1847+writeChunks n = FL.many (writeN n) FL.toStreamK
22841848
2285− where
2286−
2287− initial = do
2288− when (elemCount < 0) $ error "createWith: elemCount is negative"
2289− newAs ps elemCount
2290−
2291− step arr@(MutArray _ start end bound) x
2292− | INDEX_NEXT(end,a) > bound = do
2293− let oldSize = end - start
2294− newSize = max (oldSize * 2) 1
2295− arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
2296− snocUnsafe arr1 x
2297− step arr x = snocUnsafe arr x
2298−
2299− extract = liftIO . rightSize
2300−
2301−-- XXX Compare createWith with fromStreamD which uses an array of streams
2302−-- implementation. We can write this using buildChunks above if that is faster.
2303−-- If createWith is faster then we should use that to implement
1849+-- XXX Compare writeWith with fromStreamD which uses an array of streams
1850+-- implementation. We can write this using writeChunks above if that is faster.
1851+-- If writeWith is faster then we should use that to implement
23041852-- fromStreamD.
23051853--
23061854-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2315,91 +1863,74 @@ writeWithAs ps elemCount =
23151863-- XXX check if GHC's memory allocator is efficient enough. We can try the C
23161864-- malloc to compare against.
23171865
2318−-- | @createWith minCount@ folds the whole input to a single array. The array
1866+-- | @writeWith minCount@ folds the whole input to a single array. The array
23191867-- starts at a size big enough to hold minCount elements, the size is doubled
23201868-- every time the array needs to be grown.
23211869--
23221870-- /Caution! Do not use this on infinite streams./
23231871--
2324−-- >>> f n = MutArray.appendWith (* 2) (MutArray.emptyOf n)
2325−-- >>> createWith n = Fold.rmapM MutArray.rightSize (f n)
2326−-- >>> createWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
1872+-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.newPinned n)
1873+-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
1874+-- >>> writeWith n = Fold.rmapM MutArray.fromArrayStreamK (MutArray.writeChunks n)
23271875--
23281876-- /Pre-release/
2329−{-# INLINE_NORMAL createWith #-}
2330−createWith :: forall m a. (MonadIO m, Unbox a)
2331− => Int -> Fold m a (MutArray a)
2332−-- createWith n = FL.rmapM rightSize $ appendWith (* 2) (emptyOf n)
2333−createWith = writeWithAs Unpinned
2334−
2335−{-# DEPRECATED writeWith "Please use createWith instead." #-}
2336−{-# INLINE writeWith #-}
1877+{-# INLINE_NORMAL writeWith #-}
23371878writeWith :: forall m a. (MonadIO m, Unbox a)
23381879 => Int -> Fold m a (MutArray a)
2339−writeWith = createWith
1880+-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (newPinned n)
1881+writeWith elemCount =
1882+ FL.rmapM extract $ FL.foldlM' step initial
1883+
1884+ where
1885+
1886+ initial = do
1887+ when (elemCount < 0) $ error "writeWith: elemCount is negative"
1888+ liftIO $ newPinned elemCount
1889+
1890+ step arr@(MutArray _ start end bound) x
1891+ | INDEX_NEXT(end,a) > bound = do
1892+ let oldSize = end - start
1893+ newSize = max (oldSize * 2) 1
1894+ arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
1895+ snocUnsafe arr1 x
1896+ step arr x = snocUnsafe arr x
1897+
1898+ extract = liftIO . rightSize
23401899
23411900-- | Fold the whole input to a single array.
23421901--
2343−-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
1902+-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
23441903-- rounded up to the element size.
23451904--
23461905-- /Caution! Do not use this on infinite streams./
23471906--
2348−{-# INLINE create #-}
2349−create :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2350−create = createWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2351−
2352−-- XXX Deprecate in major
2353−-- {-# DEPRECATED write "Please use create instead." #-}
23541907{-# INLINE write #-}
23551908write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2356−write = create
2357−
2358−-- | Like 'create' but creates a pinned array.
2359−{-# INLINE pinnedCreate #-}
2360−pinnedCreate :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2361−pinnedCreate =
2362− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2363−
2364−{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
2365−{-# INLINE pinnedWrite #-}
2366−pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2367−pinnedWrite = pinnedCreate
1909+write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
23681910
23691911-------------------------------------------------------------------------------
23701912-- construct from streams, known size
23711913-------------------------------------------------------------------------------
23721914
2373−{-# INLINE_NORMAL fromStreamDNAs #-}
2374−fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
2375− => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
2376−fromStreamDNAs ps limit str = do
2377− (arr :: MutArray a) <- newAs ps limit
1915+-- | Use the 'writeN' fold instead.
1916+--
1917+-- >>> fromStreamDN n = Stream.fold (MutArray.writeN n)
1918+--
1919+{-# INLINE_NORMAL fromStreamDN #-}
1920+fromStreamDN :: forall m a. (MonadIO m, Unbox a)
1921+ => Int -> D.Stream m a -> m (MutArray a)
1922+-- fromStreamDN n = D.fold (writeN n)
1923+fromStreamDN limit str = do
1924+ (arr :: MutArray a) <- liftIO $ newPinned limit
23781925 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
23791926 return $ arr {arrEnd = end}
23801927
23811928 where
23821929
23831930 fwrite arrContents ptr x = do
2384− liftIO $ pokeAt ptr arrContents x
1931+ liftIO $ pokeWith arrContents ptr x
23851932 return $ INDEX_NEXT(ptr,a)
23861933
2387−-- | Use the 'createOf' fold instead.
2388−--
2389−-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
2390−--
2391−{-# INLINE_NORMAL fromStreamN #-}
2392−fromStreamN :: forall m a. (MonadIO m, Unbox a)
2393− => Int -> D.Stream m a -> m (MutArray a)
2394−-- fromStreamDN n = D.fold (createOf n)
2395−fromStreamN = fromStreamDNAs Unpinned
2396−
2397−{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398−{-# INLINE fromStreamDN #-}
2399−fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2400− => Int -> D.Stream m a -> m (MutArray a)
2401−fromStreamDN = fromStreamN
2402−
24031934-- | Create a 'MutArray' from the first N elements of a list. The array is
24041935-- allocated to size N, if the list terminates before N elements then the
24051936-- array may hold less than N elements.
@@ -2408,80 +1939,15 @@ fromStreamDN = fromStreamN
24081939fromListN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
24091940fromListN n xs = fromStreamDN n $ D.fromList xs
24101941
2411−-- | Like 'fromListN' but creates a pinned array.
2412−{-# INLINABLE pinnedFromListN #-}
2413−pinnedFromListN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2414−pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
2415−
24161942-- | Like fromListN but writes the array in reverse order.
24171943--
24181944-- /Pre-release/
24191945{-# INLINE fromListRevN #-}
24201946fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2421−fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
2422−
2423−-- | Convert a pure stream in Identity monad to a mutable array.
2424−{-# INLINABLE fromPureStreamN #-}
2425−fromPureStreamN :: (MonadIO m, Unbox a) =>
2426− Int -> Stream Identity a -> m (MutArray a)
2427−fromPureStreamN n xs =
2428− D.fold (createOf n) $ D.morphInner (return . runIdentity) xs
2429−
2430−-- | Convert a pure stream in Identity monad to a mutable array.
2431−{-# INLINABLE fromPureStream #-}
2432−fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2433−fromPureStream xs =
2434− D.fold create $ D.morphInner (return . runIdentity) xs
2435−
2436−{-# INLINABLE fromPtrN #-}
2437−fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
2438−fromPtrN len addr = do
2439− -- memcpy is better than stream copy when the size is known.
2440− -- XXX We can implement a stream copy in a similar way by streaming Word64
2441− -- first and then remaining Word8.
2442− arr <- new len
2443− _ <- unsafeAsPtr arr
2444− (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2445− return (arr {arrEnd = len})
2446−
2447−{-# INLINABLE fromByteStr# #-}
2448−fromByteStr# :: MonadIO m => Addr# -> m (MutArray Word8)
2449−fromByteStr# addr = do
2450− -- It is better to count the size first and allocate exact space.
2451− -- Also, memcpy is better than stream copy when the size is known.
2452− -- C strlen compares 4 bytes at a time, so is better than the stream
2453− -- version. https://github.com/bminor/glibc/blob/master/string/strlen.c
2454− -- XXX We can possibly use a stream of Word64 to do the same.
2455− -- fromByteStr# addr = fromPureStream (D.fromByteStr# addr)
2456− len <- liftIO $ c_strlen (Ptr addr)
2457− let lenInt = fromIntegral len
2458− arr <- new lenInt
2459− _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2460− return (arr {arrEnd = lenInt})
1947+fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
24611948
24621949-------------------------------------------------------------------------------
2463−-- convert a stream of arrays to a single array by reallocating and copying
2464−-------------------------------------------------------------------------------
2465−
2466−-- XXX Both of these implementations of splicing seem to perform equally well.
2467−-- We need to perform benchmarks over a range of sizes though.
2468−
2469−-- | Also see 'fromChunksK'.
2470−{-# INLINE fromChunksRealloced #-}
2471−fromChunksRealloced :: forall m a. (MonadIO m, Unbox a)
2472− => Stream m (MutArray a) -> m (MutArray a)
2473−fromChunksRealloced s = do
2474− res <- D.uncons s
2475− case res of
2476− Just (a, strm) -> do
2477− arr <- D.foldlM' spliceExp (pure a) strm
2478− -- Reallocation is exponential so there may be 50% empty space in
2479− -- worst case. One more reallocation to reclaim the space.
2480− rightSize arr
2481− Nothing -> pure nil
2482−
2483−-------------------------------------------------------------------------------
2484−-- convert a stream of arrays to a single array by buffering arrays first
1950+-- convert stream to a single array
24851951-------------------------------------------------------------------------------
24861952
24871953{-# INLINE arrayStreamKLength #-}
@@ -2491,72 +1957,29 @@ arrayStreamKLength as = K.foldl' (+) 0 (K.map length as)
24911957-- | Convert an array stream to an array. Note that this requires peak memory
24921958-- that is double the size of the array stream.
24931959--
2494−{-# INLINE fromChunkskAs #-}
2495−fromChunkskAs :: (Unbox a, MonadIO m) =>
2496− PinnedState -> StreamK m (MutArray a) -> m (MutArray a)
2497−fromChunkskAs ps as = do
2498− len <- arrayStreamKLength as
2499− arr <- newAs ps len
2500− -- XXX is StreamK fold faster or StreamD fold?
2501− K.foldlM' spliceUnsafe (pure arr) as
2502− -- fromStreamDN len $ D.unfoldMany reader $ D.fromStreamK as
2503−
2504−-- XXX Need to compare this with fromChunks and fromChunkList and keep the
2505−-- fastest or simplest one if all are equally fast.
2506−
2507−-- | Convert an array stream to an array. Note that this requires peak memory
2508−-- that is double the size of the array stream.
2509−--
2510−-- Also see 'fromChunksRealloced'.
2511−--
2512−{-# INLINE fromChunksK #-}
2513−fromChunksK :: (Unbox a, MonadIO m) =>
2514− StreamK m (MutArray a) -> m (MutArray a)
2515−fromChunksK = fromChunkskAs Unpinned
2516−
2517−{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
25181960{-# INLINE fromArrayStreamK #-}
25191961fromArrayStreamK :: (Unbox a, MonadIO m) =>
25201962 StreamK m (MutArray a) -> m (MutArray a)
2521−fromArrayStreamK = fromChunksK
2522−
2523−{-# INLINE fromStreamDAs #-}
2524−fromStreamDAs ::
2525− (MonadIO m, Unbox a) => PinnedState -> D.Stream m a -> m (MutArray a)
2526−fromStreamDAs ps m =
2527− arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2528−
2529−-- | Create an 'Array' from a stream. This is useful when we want to create a
2530−-- single array from a stream of unknown size. 'createOf' is at least twice
2531−-- as efficient when the size is already known.
2532−--
2533−-- Note that if the input stream is too large memory allocation for the array
2534−-- may fail. When the stream size is not known, `chunksOf` followed by
2535−-- processing of indvidual arrays in the resulting stream should be preferred.
2536−--
2537−-- /Pre-release/
2538−{-# INLINE fromStream #-}
2539−fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2540−fromStream = fromStreamDAs Unpinned
1963+fromArrayStreamK as = do
1964+ len <- arrayStreamKLength as
1965+ fromStreamDN len $ D.unfoldMany reader $ D.fromStreamK as
25411966
2542−-- fromStream (Stream m) = P.fold create m
25431967-- CAUTION: a very large number (millions) of arrays can degrade performance
25441968-- due to GC overhead because we need to buffer the arrays before we flatten
25451969-- all the arrays.
25461970--
2547−-- XXX Compare if this is faster or "fold create".
1971+-- XXX Compare if this is faster or "fold write".
25481972--
25491973-- | We could take the approach of doubling the memory allocation on each
25501974-- overflow. This would result in more or less the same amount of copying as in
25511975-- the chunking approach. However, if we have to shrink in the end then it may
25521976-- result in an extra copy of the entire data.
25531977--
2554−-- >>> fromStreamD = StreamD.fold MutArray.create
1978+-- >>> fromStreamD = StreamD.fold MutArray.write
25551979--
25561980{-# INLINE fromStreamD #-}
2557−{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
25581981fromStreamD :: (MonadIO m, Unbox a) => D.Stream m a -> m (MutArray a)
2559−fromStreamD = fromStream
1982+fromStreamD m = arrayStreamKFromStreamD m >>= fromArrayStreamK
25601983
25611984-- | Create a 'MutArray' from a list. The list must be of finite size.
25621985--
@@ -2564,11 +1987,6 @@ fromStreamD = fromStream
25641987fromList :: (MonadIO m, Unbox a) => [a] -> m (MutArray a)
25651988fromList xs = fromStreamD $ D.fromList xs
25661989
2567−-- | Like 'fromList' but creates a pinned array.
2568−{-# INLINE pinnedFromList #-}
2569−pinnedFromList :: (MonadIO m, Unbox a) => [a] -> m (MutArray a)
2570−pinnedFromList xs = fromStreamDAs Pinned $ D.fromList xs
2571−
25721990-- XXX We are materializing the whole list first for getting the length. Check
25731991-- if the 'fromList' like chunked implementation would fare better.
25741992
@@ -2577,75 +1995,44 @@ pinnedFromList xs = fromStreamDAs Pinned $ D.fromList xs
25771995fromListRev :: (MonadIO m, Unbox a) => [a] -> m (MutArray a)
25781996fromListRev xs = fromListRevN (Prelude.length xs) xs
25791997
2580−-------------------------------------------------------------------------------
2581−-- Cloning
2582−-------------------------------------------------------------------------------
2583−
2584−-- Arrays are aligned on 64-bit boundaries. The fastest way to copy an array is
2585−-- to unsafeCast it to Word64, read it, write it to Word64 array and unsafeCast
2586−-- it again. We can use SIMD read/write as well.
2587−
2588−{-# INLINE cloneAs #-}
2589−cloneAs ::
2590− ( MonadIO m
2591−#ifdef DEVBUILD
2592− , Unbox a
2593−#endif
2594− )
2595− => PinnedState -> MutArray a -> m (MutArray a)
2596−cloneAs ps src =
2597− do
2598− let startSrc = arrStart src
2599− srcLen = arrEnd src - startSrc
2600− newArrContents <-
2601− Unboxed.cloneSliceUnsafeAs ps startSrc srcLen (arrContents src)
2602− return $ MutArray newArrContents 0 srcLen srcLen
2603−
2604−{-# INLINE clone #-}
2605−clone ::
2606− ( MonadIO m
2607−#ifdef DEVBUILD
2608− , Unbox a
2609−#endif
2610− )
2611− => MutArray a -> m (MutArray a)
2612−clone = cloneAs Unpinned
2613−
2614−{-# INLINE pinnedClone #-}
2615−pinnedClone ::
2616− ( MonadIO m
2617−#ifdef DEVBUILD
2618− , Unbox a
2619−#endif
2620− )
2621− => MutArray a -> m (MutArray a)
2622−pinnedClone = cloneAs Pinned
2623−
26241998-------------------------------------------------------------------------------
26251999-- Combining
26262000-------------------------------------------------------------------------------
26272001
2628−-- | Copy two arrays into a newly allocated array. If the first array is pinned
2629−-- the spliced array is also pinned.
2002+-- | Put a sub range of a source array into a subrange of a destination array.
2003+-- This is not safe as it does not check the bounds.
2004+{-# INLINE putSliceUnsafe #-}
2005+putSliceUnsafe :: MonadIO m => MutArray a -> Int -> MutArray a -> Int -> Int -> m ()
2006+putSliceUnsafe src srcStartBytes dst dstStartBytes lenBytes = liftIO $ do
2007+ assertM(lenBytes <= arrBound dst - dstStartBytes)
2008+ assertM(lenBytes <= arrEnd src - srcStartBytes)
2009+ let !(I# srcStartBytes#) = srcStartBytes
2010+ !(I# dstStartBytes#) = dstStartBytes
2011+ !(I# lenBytes#) = lenBytes
2012+ let arrS# = getMutableByteArray# (arrContents src)
2013+ arrD# = getMutableByteArray# (arrContents dst)
2014+ IO $ \s# -> (# copyMutableByteArray#
2015+ arrS# srcStartBytes# arrD# dstStartBytes# lenBytes# s#
2016+ , () #)
2017+
2018+-- | Copy two arrays into a newly allocated array.
26302019{-# INLINE spliceCopy #-}
26312020spliceCopy :: forall m a. MonadIO m =>
26322021#ifdef DEVBUILD
26332022 Unbox a =>
26342023#endif
26352024 MutArray a -> MutArray a -> m (MutArray a)
2636−spliceCopy arr1 arr2 = do
2025+spliceCopy arr1 arr2 = liftIO $ do
26372026 let start1 = arrStart arr1
26382027 start2 = arrStart arr2
26392028 len1 = arrEnd arr1 - start1
26402029 len2 = arrEnd arr2 - start2
2030+ newArrContents <- liftIO $ Unboxed.newPinnedBytes (len1 + len2)
26412031 let len = len1 + len2
2642− newArrContents <-
2643− if Unboxed.isPinned (arrContents arr1)
2644− then liftIO $ Unboxed.pinnedNew len
2645− else liftIO $ Unboxed.new len
2646− putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
2647− putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
2648− return $ MutArray newArrContents 0 len len
2032+ newArr = MutArray newArrContents 0 len len
2033+ putSliceUnsafe arr1 start1 newArr 0 len1
2034+ putSliceUnsafe arr2 start2 newArr len1 len2
2035+ return newArr
26492036
26502037-- | Really really unsafe, appends the second array into the first array. If
26512038-- the first array does not have enough space it may cause silent data
@@ -2654,13 +2041,12 @@ spliceCopy arr1 arr2 = do
26542041spliceUnsafe :: MonadIO m =>
26552042 MutArray a -> MutArray a -> m (MutArray a)
26562043spliceUnsafe dst src =
2657− do
2044+ liftIO $ do
26582045 let startSrc = arrStart src
26592046 srcLen = arrEnd src - startSrc
26602047 endDst = arrEnd dst
26612048 assertM(endDst + srcLen <= arrBound dst)
2662− putSliceUnsafe
2663− (arrContents src) startSrc (arrContents dst) endDst srcLen
2049+ putSliceUnsafe src startSrc dst endDst srcLen
26642050 return $ dst {arrEnd = endDst + srcLen}
26652051
26662052-- | @spliceWith sizer dst src@ mutates @dst@ to append @src@. If there is no
@@ -2676,7 +2062,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
26762062 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
26772063spliceWith sizer dst@(MutArray _ start end bound) src = do
26782064{-
2679− let f = appendWith (`sizer` byteLength src) (return dst)
2065+ let f = writeAppendWith (`sizer` byteLength src) (return dst)
26802066 in D.fold f (toStreamD src)
26812067-}
26822068 assert (end <= bound) (return ())
@@ -2692,7 +2078,7 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
26922078 $ "splice: newSize is less than the total size "
26932079 ++ "of arrays being appended. Please check the "
26942080 ++ "sizer function passed."
2695− realloc newSizeInBytes dst
2081+ liftIO $ realloc newSizeInBytes dst
26962082 else return dst
26972083 spliceUnsafe dst1 src
26982084
@@ -2704,8 +2090,6 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
27042090--
27052091-- >>> splice = MutArray.spliceWith (+)
27062092--
2707−-- If the original array is pinned the spliced array is also pinned.
2708−--
27092093-- /Pre-release/
27102094{-# INLINE splice #-}
27112095splice :: (MonadIO m, Unbox a) => MutArray a -> MutArray a -> m (MutArray a)
@@ -2729,24 +2113,14 @@ spliceExp = spliceWith (\l1 l2 -> max (l1 * 2) (l1 + l2))
27292113-- Splitting
27302114-------------------------------------------------------------------------------
27312115
2732−-- | Generate a stream of array slices using a predicate. The array element
2733−-- matching the predicate is dropped.
2734−--
2735−-- /Pre-release/
2736−{-# INLINE splitOn #-}
2737−splitOn :: (MonadIO m, Unbox a) =>
2738− (a -> Bool) -> MutArray a -> Stream m (MutArray a)
2739−splitOn predicate arr =
2740− fmap (\(i, len) -> getSliceUnsafe i len arr)
2741− $ D.indexOnSuffix predicate (read arr)
2742−
27432116-- | Drops the separator byte
27442117{-# INLINE breakOn #-}
27452118breakOn :: MonadIO m
27462119 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2747−breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2120+breakOn sep arr@MutArray{..} = asPtrUnsafe arr $ \p -> liftIO $ do
2121+ -- XXX Instead of using asPtrUnsafe (pinning memory) we can pass unlifted
2122+ -- Addr# to memchr and it should be safe (from ghc 8.4).
27482123 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2749− -- Need efficient stream based primitives that work on Word64.
27502124 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
27512125 let sepIndex = loc `minusPtr` p
27522126 return $
@@ -2767,41 +2141,32 @@ breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
27672141 }
27682142 )
27692143
2770−-- | Like 'splitAt' but does not check whether the index is valid.
2771−--
2772−{-# INLINE unsafeSplitAt #-}
2773−unsafeSplitAt :: forall a. Unbox a =>
2774− Int -> MutArray a -> (MutArray a, MutArray a)
2775−unsafeSplitAt i MutArray{..} =
2776− let off = i * SIZE_OF(a)
2777− p = arrStart + off
2778− in ( MutArray
2779− { arrContents = arrContents
2780− , arrStart = arrStart
2781− , arrEnd = p
2782− , arrBound = p
2783− }
2784− , MutArray
2785− { arrContents = arrContents
2786− , arrStart = p
2787− , arrEnd = arrEnd
2788− , arrBound = arrBound
2789− }
2790− )
2791−
27922144-- | Create two slices of an array without copying the original array. The
27932145-- specified index @i@ is the first index of the second slice.
27942146--
2795−{-# INLINE splitAt #-}
27962147splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2797−splitAt i arr =
2148+splitAt i arr@MutArray{..} =
27982149 let maxIndex = length arr - 1
27992150 in if i < 0
28002151 then error "sliceAt: negative array index"
28012152 else if i > maxIndex
28022153 then error $ "sliceAt: specified array index " ++ show i
28032154 ++ " is beyond the maximum index " ++ show maxIndex
2804− else unsafeSplitAt i arr
2155+ else let off = i * SIZE_OF(a)
2156+ p = arrStart + off
2157+ in ( MutArray
2158+ { arrContents = arrContents
2159+ , arrStart = arrStart
2160+ , arrEnd = p
2161+ , arrBound = p
2162+ }
2163+ , MutArray
2164+ { arrContents = arrContents
2165+ , arrStart = p
2166+ , arrEnd = arrEnd
2167+ , arrBound = arrBound
2168+ }
2169+ )
28052170
28062171-------------------------------------------------------------------------------
28072172-- Casting
@@ -2851,16 +2216,13 @@ cast arr =
28512216-- guarantees that unsafe calls will be performed in the calling thread. Making
28522217-- it safe to pass heap-allocated objects to unsafe functions.
28532218
2854−-- XXX 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
2856−-- pinning the memory.
2857−--
2858−-- XXX we cannot pass the length of the ptr here as in some cases it may not be
2859−-- available e.g. a null terminated C string. However, we can create another
2860−-- flavor of the API e.g. asPtrN.
2219+-- Unsafe because of direct pointer operations. The user must ensure that they
2220+-- are writing within the legal bounds of the array. Should we just name it
2221+-- asPtr, the unsafety is implicit for any pointer operations. And we are safe
2222+-- from Haskell perspective because we will be pinning the memory.
28612223
2862−-- | 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.
2224+-- | Use an @MutArray a@ as @Ptr a@. This is useful when we want to pass an array
2225+-- as a pointer to some operating system call or to a "safe" FFI call.
28642226--
28652227-- If the array is not pinned it is copied to pinned memory before passing it
28662228-- to the monadic action.
@@ -2870,382 +2232,58 @@ cast arr =
28702232-- opportunistically before this operation occurs, to avoid the cost of a copy
28712233-- if possible.
28722234--
2873−-- /Unsafe/ because of direct pointer operations. The user must ensure that
2874−-- they are writing within the legal bounds of the array.
2235+-- /Unsafe/
28752236--
28762237-- /Pre-release/
28772238--
2878−{-# INLINE unsafePinnedAsPtr #-}
2879−unsafePinnedAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2880−unsafePinnedAsPtr arr f =
2881− Unboxed.unsafePinnedAsPtr
2882− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2883−
2884−{-# DEPRECATED asPtrUnsafe "Please use unsafePinnedAsPtr instead." #-}
2885−{-# INLINE asPtrUnsafe #-}
28862239asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2887−asPtrUnsafe = unsafePinnedAsPtr
2888−
2889−{-# INLINE unsafeAsPtr #-}
2890−unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2891−unsafeAsPtr arr f =
2892− Unboxed.unsafeAsPtr
2893− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2240+asPtrUnsafe arr f = do
2241+ let contents = arrContents arr
2242+ !ptr = Ptr (byteArrayContents#
2243+ (unsafeCoerce# (getMutableByteArray# contents)))
2244+ -- XXX Check if the array is pinned, if not, copy it to a pinned array
2245+ -- XXX We should probably pass to the IO action the byte length of the array
2246+ -- as well so that bounds can be checked.
2247+ r <- f (ptr `plusPtr` arrStart arr)
2248+ liftIO $ touch contents
2249+ return r
28942250
28952251-------------------------------------------------------------------------------
28962252-- Equality
28972253-------------------------------------------------------------------------------
28982254
2899−-- | Byte compare two arrays. Compare the length of the arrays. If the length
2900−-- is equal, compare the lexicographical ordering of two underlying byte arrays
2901−-- otherwise return the result of length comparison.
2902−--
2903−-- /Unsafe/: Note that the 'Unbox' instance of sum types with constructors of
2904−-- different sizes may leave some memory uninitialized which can make byte
2905−-- comparison unreliable.
2255+-- | Compare the length of the arrays. If the length is equal, compare the
2256+-- lexicographical ordering of two underlying byte arrays otherwise return the
2257+-- result of length comparison.
29062258--
29072259-- /Pre-release/
2908−{-# INLINE byteCmp #-}
2909−byteCmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2910−byteCmp arr1 arr2 = do
2911− let marr1 = getMutableByteArray# (arrContents arr1)
2912− marr2 = getMutableByteArray# (arrContents arr2)
2913− !(I# st1#) = arrStart arr1
2914− !(I# st2#) = arrStart arr2
2915− !(I# len#) = byteLength arr1
2916− case compare (byteLength arr1) (byteLength arr2) of
2917− EQ -> do
2918− r <- liftIO $ IO $ \s# ->
2919− let res =
2920− I#
2921− (compareByteArrays#
2922− (unsafeCoerce# marr1)
2923− st1#
2924− (unsafeCoerce# marr2)
2925− st2#
2926− len#)
2927− in (# s#, res #)
2928− return $ compare r 0
2929− x -> return x
2930−
29312260{-# INLINE cmp #-}
2932−{-# DEPRECATED cmp "Please use byteCmp instead." #-}
29332261cmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2934−cmp = byteCmp
2935−
2936−-- | Byte equality of two arrays.
2937−--
2938−-- >>> byteEq arr1 arr2 = (==) EQ $ MArray.byteCmp arr1 arr2
2939−--
2940−-- /Unsafe/: See 'byteCmp'.
2941−{-# INLINE byteEq #-}
2942−byteEq :: MonadIO m => MutArray a -> MutArray a -> m Bool
2943−byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
2944−
2945−-------------------------------------------------------------------------------
2946−-- Compact
2947−-------------------------------------------------------------------------------
2948−
2949−-- Note: LE versions avoid an extra copy compared to GE. LE parser trades
2950−-- backtracking one array in lieu of avoiding a copy. However, LE and GE both
2951−-- can leave some memory unused. They can split the last array to fit it
2952−-- exactly in the space.
2953−
2954−{-# INLINE_NORMAL pCompactLeAs #-}
2955−pCompactLeAs ::
2956− forall m a. (MonadIO m, Unbox a)
2957− => PinnedState -> Int -> Parser (MutArray a) m (MutArray a)
2958−pCompactLeAs ps maxElems = Parser step initial extract
2959−
2960− where
2961−
2962− maxBytes = maxElems * SIZE_OF(a)
2963−
2964− functionName = "Streamly.Internal.Data.MutArray.pCompactLE"
2965−
2966− initial =
2967− return
2968− $ if maxElems <= 0
2969− then error
2970− $ functionName
2971− ++ ": the size of arrays ["
2972− ++ show maxElems ++ "] must be a natural number"
2973− else Parser.IPartial Nothing
2974−
2975− step Nothing arr =
2976− return
2977− $ let len = byteLength arr
2978− in if len >= maxBytes
2979− then Parser.Done 0 arr
2980− else Parser.Partial 0 (Just arr)
2981− -- XXX Split the last array to use the space more compactly.
2982− step (Just buf) arr =
2983− let len = byteLength buf + byteLength arr
2984− in if len > maxBytes
2985− then return $ Parser.Done 1 buf
2986− else do
2987− buf1 <-
2988− if byteCapacity buf < maxBytes
2989− then liftIO $ reallocExplicitAs
2990− ps (SIZE_OF(a)) maxBytes buf
2991− else return buf
2992− buf2 <- spliceUnsafe buf1 arr
2993− return $ Parser.Partial 0 (Just buf2)
2994−
2995− extract Nothing = return $ Parser.Done 0 nil
2996− extract (Just buf) = return $ Parser.Done 0 buf
2997−
2998−-- | Parser @pCompactLE maxElems@ coalesces adjacent arrays in the input stream
2999−-- only if the combined size would be less than or equal to @maxElems@
3000−-- elements. Note that it won't split an array if the original array is already
3001−-- larger than maxElems.
3002−--
3003−-- @maxElems@ must be greater than 0.
3004−--
3005−-- Generates unpinned arrays irrespective of the pinning status of input
3006−-- arrays.
3007−--
3008−-- /Internal/
3009−{-# INLINE pCompactLE #-}
3010−pCompactLE ::
3011− forall m a. (MonadIO m, Unbox a)
3012− => Int -> Parser (MutArray a) m (MutArray a)
3013−pCompactLE = pCompactLeAs Unpinned
3014−
3015−-- | Pinned version of 'pCompactLE'.
3016−{-# INLINE pPinnedCompactLE #-}
3017−pPinnedCompactLE ::
3018− forall m a. (MonadIO m, Unbox a)
3019− => Int -> Parser (MutArray a) m (MutArray a)
3020−pPinnedCompactLE = pCompactLeAs Pinned
3021−
3022−data SpliceState s arr
3023− = SpliceInitial s
3024− | SpliceBuffering s arr
3025− | SpliceYielding arr (SpliceState s arr)
3026− | SpliceFinish
3027−
3028−-- This mutates the first array (if it has space) to append values from the
3029−-- second one. This would work for immutable arrays as well because an
3030−-- immutable array never has additional space so a new array is allocated
3031−-- instead of mutating it.
3032−
3033−{-# INLINE_NORMAL compactLeAs #-}
3034−compactLeAs :: forall m a. (MonadIO m, Unbox a)
3035− => PinnedState -> Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
3036−compactLeAs ps maxElems (D.Stream step state) =
3037− D.Stream step' (SpliceInitial state)
3038−
3039− where
3040−
3041− maxBytes = maxElems * SIZE_OF(a)
3042−
3043− functionName = "Streamly.Internal.Data.MutArray.rCompactLE"
3044−
3045− {-# INLINE_LATE step' #-}
3046− step' gst (SpliceInitial st) = do
3047− when (maxElems <= 0) $
3048− -- XXX we can pass the module string from the higher level API
3049− error $ functionName ++ ": the size of arrays [" ++ show maxElems
3050− ++ "] must be a natural number"
3051− r <- step gst st
3052− case r of
3053− D.Yield arr s -> return $
3054− let len = byteLength arr
3055− in if len >= maxBytes
3056− then D.Skip (SpliceYielding arr (SpliceInitial s))
3057− else D.Skip (SpliceBuffering s arr)
3058− D.Skip s -> return $ D.Skip (SpliceInitial s)
3059− D.Stop -> return D.Stop
3060−
3061− -- XXX Split the last array to use the space more compactly.
3062− step' gst (SpliceBuffering st buf) = do
3063− r <- step gst st
3064− case r of
3065− D.Yield arr s -> do
3066− let len = byteLength buf + byteLength arr
3067− if len > maxBytes
3068− then return $
3069− D.Skip (SpliceYielding buf (SpliceBuffering s arr))
3070− else do
3071− buf1 <- if byteCapacity buf < maxBytes
3072− then liftIO $ reallocExplicitAs
3073− ps (SIZE_OF(a)) maxBytes buf
3074− else return buf
3075− buf2 <- spliceUnsafe buf1 arr
3076− return $ D.Skip (SpliceBuffering s buf2)
3077− D.Skip s -> return $ D.Skip (SpliceBuffering s buf)
3078− D.Stop -> return $ D.Skip (SpliceYielding buf SpliceFinish)
3079−
3080− step' _ SpliceFinish = return D.Stop
3081−
3082− step' _ (SpliceYielding arr next) = return $ D.Yield arr next
3083−
3084−
3085−{-# INLINE_NORMAL fCompactGeAs #-}
3086−fCompactGeAs ::
3087− forall m a. (MonadIO m, Unbox a)
3088− => PinnedState -> Int -> FL.Fold m (MutArray a) (MutArray a)
3089−fCompactGeAs ps minElems = Fold step initial extract extract
3090−
3091− where
3092−
3093− minBytes = minElems * SIZE_OF(a)
3094−
3095− functionName = "Streamly.Internal.Data.MutArray.fCompactGE"
3096−
3097− initial =
3098− return
3099− $ if minElems < 0
3100− then error
3101− $ functionName
3102− ++ ": the size of arrays ["
3103− ++ show minElems ++ "] must be a natural number"
3104− else FL.Partial Nothing
3105−
3106− step Nothing arr =
3107− return
3108− $ let len = byteLength arr
3109− in if len >= minBytes
3110− then FL.Done arr
3111− else FL.Partial (Just arr)
3112− -- XXX Buffer arrays as a list to avoid copy and reallocations
3113− step (Just buf) arr = do
3114− let len = byteLength buf + byteLength arr
3115− buf1 <-
3116− if byteCapacity buf < len
3117− then liftIO $ reallocExplicitAs
3118− ps (SIZE_OF(a)) (max minBytes len) buf
3119− else return buf
3120− buf2 <- spliceUnsafe buf1 arr
3121− if len >= minBytes
3122− then return $ FL.Done buf2
3123− else return $ FL.Partial (Just buf2)
3124−
3125− extract Nothing = return nil
3126− extract (Just buf) = return buf
3127−
3128−-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
3129−-- until the size becomes greater than or equal to @minElems@.
3130−--
3131−-- Generates unpinned arrays irrespective of the pinning status of input
3132−-- arrays.
3133−{-# INLINE fCompactGE #-}
3134−fCompactGE ::
3135− forall m a. (MonadIO m, Unbox a)
3136− => Int -> FL.Fold m (MutArray a) (MutArray a)
3137−fCompactGE = fCompactGeAs Unpinned
3138−
3139−-- | Pinned version of 'fCompactGE'.
3140−{-# INLINE fPinnedCompactGE #-}
3141−fPinnedCompactGE ::
3142− forall m a. (MonadIO m, Unbox a)
3143− => Int -> FL.Fold m (MutArray a) (MutArray a)
3144−fPinnedCompactGE = fCompactGeAs Pinned
3145−
3146−{-# INLINE_NORMAL lCompactGeAs #-}
3147−lCompactGeAs :: forall m a. (MonadIO m, Unbox a)
3148− => PinnedState -> Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3149−-- The fold version turns out to be a little bit slower.
3150−-- lCompactGeAs ps n = FL.many (fCompactGeAs ps n)
3151−lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
3152− Fold step initial extract final
3153−
3154− where
3155−
3156− minBytes = minElems * SIZE_OF(a)
3157−
3158− functionName = "Streamly.Internal.Data.MutArray.lCompactGE"
3159−
3160− initial = do
3161− when (minElems <= 0) $
3162− -- XXX we can pass the module string from the higher level API
3163− error $ functionName ++ ": the size of arrays ["
3164− ++ show minElems ++ "] must be a natural number"
3165−
3166− r <- initial1
3167− return $ first (Tuple' Nothing) r
3168−
3169− {-# INLINE runInner #-}
3170− runInner len acc buf =
3171− if len >= minBytes
3172− then do
3173− r <- step1 acc buf
3174− case r of
3175− FL.Done _ -> return $ FL.Done ()
3176− FL.Partial s -> do
3177− _ <- final1 s
3178− res <- initial1
3179− return $ first (Tuple' Nothing) res
3180− else return $ FL.Partial $ Tuple' (Just buf) acc
3181−
3182− step (Tuple' Nothing r1) arr =
3183− runInner (byteLength arr) r1 arr
3184−
3185− -- XXX Buffer arrays as a list to avoid copy and reallocations
3186− step (Tuple' (Just buf) r1) arr = do
3187− let len = byteLength buf + byteLength arr
3188− buf1 <- if byteCapacity buf < len
3189− then liftIO $ reallocExplicitAs
3190− ps (SIZE_OF(a)) (max minBytes len) buf
3191− else return buf
3192− buf2 <- spliceUnsafe buf1 arr
3193− runInner len r1 buf2
3194−
3195− -- XXX Several folds do extract >=> final, therefore, we need to make final
3196− -- return "m b" rather than using extract post it if we want extract to be
3197− -- partial.
3198− --
3199− -- extract forces the pending buffer to be sent to the fold which is not
3200− -- what we want.
3201− extract _ = error "lCompactGE: not designed for scanning"
3202−
3203− final (Tuple' Nothing r1) = final1 r1
3204− final (Tuple' (Just buf) r1) = do
3205− r <- step1 r1 buf
3206− case r of
3207− FL.Partial rr -> final1 rr
3208− FL.Done _ -> return ()
3209−
3210−-- | Like 'compactGE' but for transforming folds instead of stream.
3211−--
3212−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3213−--
3214−-- Generates unpinned arrays irrespective of the pinning status of input
3215−-- arrays.
3216−{-# INLINE lCompactGE #-}
3217−lCompactGE :: forall m a. (MonadIO m, Unbox a)
3218− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3219−lCompactGE = lCompactGeAs Unpinned
3220−
3221−-- | Pinned version of 'lCompactGE'.
3222−{-# INLINE lPinnedCompactGE #-}
3223−lPinnedCompactGE :: forall m a. (MonadIO m, Unbox a)
3224− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3225−lPinnedCompactGE = lCompactGeAs Pinned
3226−
3227−-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3228−-- the size becomes greater than or equal to @n@.
3229−--
3230−-- >>> compactGE n = Stream.foldMany (MutArray.fCompactGE n)
3231−--
3232−{-# INLINE compactGE #-}
3233−compactGE ::
3234− (MonadIO m, Unbox a)
3235− => Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3236−compactGE n = D.foldMany (fCompactGE n)
3237−
3238−-- | 'compactEQ n' coalesces adajacent arrays in the input stream to
3239−-- arrays of exact size @n@.
3240−--
3241−-- /Unimplemented/
3242−{-# INLINE compactEQ #-}
3243−compactEQ :: -- (MonadIO m, Unbox a) =>
3244− Int -> Stream m (MutArray a) -> Stream m (MutArray a)
3245−compactEQ _n = undefined -- D.parseManyD (pCompactEQ n)
2262+cmp arr1 arr2 =
2263+ liftIO
2264+ $ do
2265+ let marr1 = getMutableByteArray# (arrContents arr1)
2266+ marr2 = getMutableByteArray# (arrContents arr2)
2267+ !(I# st1#) = arrStart arr1
2268+ !(I# st2#) = arrStart arr2
2269+ !(I# len#) = byteLength arr1
2270+ case compare (byteLength arr1) (byteLength arr2) of
2271+ EQ -> do
2272+ r <- liftIO $ IO $ \s# ->
2273+ let res =
2274+ I#
2275+ (compareByteArrays#
2276+ (unsafeCoerce# marr1)
2277+ st1#
2278+ (unsafeCoerce# marr2)
2279+ st2#
2280+ len#)
2281+ in (# s#, res #)
2282+ return $ compare r 0
2283+ x -> return x
32462284
32472285-------------------------------------------------------------------------------
3248−-- In-place mutation algorithms
2286+-- NFData
32492287-------------------------------------------------------------------------------
32502288
32512289-- | Strip elements which match with predicate from both ends.
@@ -3274,7 +2312,7 @@ strip eq arr@MutArray{..} = liftIO $ do
32742312 getStart cur = do
32752313 if cur < arrEnd
32762314 then do
3277− r <- peekAt cur arrContents
2315+ r <- peekWith arrContents cur
32782316 if eq r
32792317 then getStart (INDEX_NEXT(cur,a))
32802318 else return cur
@@ -3284,7 +2322,7 @@ strip eq arr@MutArray{..} = liftIO $ do
32842322 if cur > low
32852323 then do
32862324 let prev = INDEX_PREV(cur,a)
3287− r <- peekAt prev arrContents
2325+ r <- peekWith arrContents prev
32882326 if eq r
32892327 then getLast prev low
32902328 else return cur