@@ -40,22 +40,22 @@ module Streamly.Internal.Data.MutArray.Type
41 -- ** Casting
41 -- ** Casting
43− , castUnsafe -- XXX unsafeCast
43+ , castUnsafe
45− , unsafePinnedAsPtr
45+ , asPtrUnsafe
46− , unsafeAsPtr
46+ , asUnpinnedPtrUnsafe
48 -- ** Construction
48 -- ** Construction
51 -- *** New
51 -- *** New
52 -- | New arrays are always empty arrays with some reserve capacity to
52 -- | New arrays are always empty arrays with some reserve capacity to
53 -- extend the length without reallocating.
53 -- extend the length without reallocating.
55− , newArrayWith -- emptyAlignedWith
55+ , newArrayWith
56− , pinnedEmptyOf
56+ , pinnedNew
57− , pinnedNewAligned -- XXX not required
58+ , pinnedNewAligned
58− -- , new -- uninitialized array of specified length
60 -- *** Cloning
60 -- *** Cloning
@@ -63,25 +63,27 @@ module Streamly.Internal.Data.MutArray.Type
64 -- *** Slicing
64 -- *** Slicing
65 -- | Get a subarray without copying
65 -- | Get a subarray without copying
66− , getSliceUnsafe -- XXX unsafeGetSlice
66+ , getSliceUnsafe
67 , getSlice
67 , getSlice
68 , splitAt -- XXX should be able to express using getSlice
68 , splitAt -- XXX should be able to express using getSlice
71 -- *** Stream Folds
71 -- *** Stream Folds
72 , ArrayUnsafe (..)
72 , ArrayUnsafe (..)
73− , unsafeCreateOfWith
73+ , writeNWithUnsafe
74− , unsafeCreateOf
74+ , writeNWith
75− , unsafePinnedCreateOf
75+ , writeNUnsafe
76− , pinnedCreateOf
76+ , pinnedWriteNUnsafe
77− , createOfWith
77+ , writeN
78− , createOf
78+ , pinnedWriteN
79− , revCreateOf
79+ , pinnedWriteNAligned
81− , pinnedCreate
81+ , writeWith
82− , createWith
82+ , write
83− , create
83+ , pinnedWrite
86 -- *** From containers
88 -- *** From containers
87 , fromListN
89 , fromListN
@@ -97,11 +99,11 @@ module Streamly.Internal.Data.MutArray.Type
97 , fromByteStr#
99 , fromByteStr#
98 , fromPtrN
100 , fromPtrN
99 , fromChunksK
101 , fromChunksK
100− , fromChunksRealloced -- fromSmallChunks
102+ , fromChunksRealloced
102 -- ** Random writes
104 -- ** Random writes
103 , putIndex
105 , putIndex
104− , putIndexUnsafe -- XXX unsafePutIndex
106+ , putIndexUnsafe
105 , putIndices
107 , putIndices
106 -- , putFromThenTo
108 -- , putFromThenTo
107 -- , putFrom -- start writing at the given position
109 -- , putFrom -- start writing at the given position
@@ -109,7 +111,7 @@ module Streamly.Internal.Data.MutArray.Type
109 -- , putFromTo
111 -- , putFromTo
110 -- , putFromRev
112 -- , putFromRev
111 -- , putUptoRev
113 -- , putUptoRev
112− , modifyIndexUnsafe -- XXX unsafeModifyIndex
114+ , modifyIndexUnsafe
113 , modifyIndex
115 , modifyIndex
114 , modifyIndices
116 , modifyIndices
@@ -120,9 +122,9 @@ module Streamly.Internal.Data.MutArray.Type
121 -- *** Indexing
123 -- *** Indexing
122 , getIndex
124 , getIndex
123− , getIndexUnsafe -- XXX unsafeGetIndex
125+ , getIndexUnsafe
124 -- , getFromThenTo
126 -- , getFromThenTo
125− , getIndexRev -- getRevIndex?
127+ , getIndexRev
126 , indexReader
128 , indexReader
127 , indexReaderWith
129 , indexReaderWith
@@ -193,20 +195,20 @@ module Streamly.Internal.Data.MutArray.Type
194 , snocLinear
196 , snocLinear
195 , snocMay
197 , snocMay
196− , snocUnsafe -- XXX unsafeSnoc
198+ , snocUnsafe
198 -- *** Appending streams
200 -- *** Appending streams
199− , unsafeAppendN
201+ , writeAppendNUnsafe
200− , appendN
202+ , writeAppendN
201− , appendWith
203+ , writeAppendWith
202− , append
204+ , writeAppend
204 -- *** Appending arrays
206 -- *** Appending arrays
205 , spliceCopy
207 , spliceCopy
206 , spliceWith
208 , spliceWith
208 , spliceExp
210 , spliceExp
209− , spliceUnsafe -- XXX unsafeSplice
211+ , spliceUnsafe
210 -- , putSlice
212 -- , putSlice
211 -- , appendSlice
213 -- , appendSlice
212 -- , appendSliceFrom
214 -- , appendSliceFrom
@@ -214,12 +216,12 @@ module Streamly.Internal.Data.MutArray.Type
214 -- ** Serialization using Unbox
216 -- ** Serialization using Unbox
215 , pokeAppend
217 , pokeAppend
216 , pokeAppendMay
218 , pokeAppendMay
217− , pokeSkipUnsafe -- unsafePokeSkip
219+ , pokeSkipUnsafe
219 -- ** Deserialization using Unbox
221 -- ** Deserialization using Unbox
220 , peekUncons
222 , peekUncons
221− , peekUnconsUnsafe -- unsafePeekUncons
223+ , peekUnconsUnsafe
222− , peekSkipUnsafe -- unsafePeekSkip
224+ , peekSkipUnsafe
224 -- Arrays of arrays
226 -- Arrays of arrays
225 -- We can add dimensionality parameter to the array type to get
227 -- We can add dimensionality parameter to the array type to get
@@ -242,8 +244,6 @@ module Streamly.Internal.Data.MutArray.Type
243 -- *** Concat
245 -- *** Concat
244 -- | Append the arrays in a stream to form a stream of elements.
246 -- | Append the arrays in a stream to form a stream of elements.
248 , concatRev
248 , concatRev
@@ -251,12 +251,9 @@ module Streamly.Internal.Data.MutArray.Type
251 -- | Append the arrays in a stream to form a stream of larger arrays.
251 -- | Append the arrays in a stream to form a stream of larger arrays.
252 , SpliceState (..)
252 , SpliceState (..)
253 , pCompactLE
253 , pCompactLE
254− , pPinnedCompactLE
254+ , rCompactLE
256 , fCompactGE
255 , fCompactGE
258 , lCompactGE
256 , lCompactGE
260 , compactGE
257 , compactGE
261 , compactEQ
258 , compactEQ
@@ -267,7 +264,6 @@ module Streamly.Internal.Data.MutArray.Type
267 , c_memchr
264 , c_memchr
269 -- * Deprecated
266 -- * Deprecated
271 , writeChunks
267 , writeChunks
272 , flattenArrays
268 , flattenArrays
273 , flattenArraysRev
269 , flattenArraysRev
@@ -279,25 +275,6 @@ module Streamly.Internal.Data.MutArray.Type
279 , getIndicesWith
275 , getIndicesWith
281 , resizeExp
277 , resizeExp
286− , writeAppendNUnsafe
293− , pinnedWriteNUnsafe
296− , pinnedWriteNAligned -- XXX not required
@@ -479,8 +456,6 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
479-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
456-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
480-- allocatePinned in GHC source.
457-- allocatePinned in GHC source.
482−-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
484-- | @newArrayWith allocator alignment count@ allocates a new array of zero
459-- | @newArrayWith allocator alignment count@ allocates a new array of zero
485-- length and with a capacity to hold @count@ elements, using @allocator
460-- length and with a capacity to hold @count@ elements, using @allocator
486-- size alignment@ as the memory allocator function.
461-- size alignment@ as the memory allocator function.
@@ -504,25 +479,12 @@ newArrayWith alloc alignSize count = do
504 , arrBound = size
479 , arrBound = size
507−-- For arrays "nil" sounds a bit odd. empty is better. The only problem with
508−-- empty is that it is also used by the Alternative type class. But assuming we
509−-- will mostly import the Array module qualified this should be fine.
511−-- | Create an empty array.
517−empty = MutArray Unboxed.empty 0 0 0
519−{-# DEPRECATED nil "Please use empty instead." #-}
521#ifdef DEVBUILD
483#ifdef DEVBUILD
522 Unbox a =>
484 Unbox a =>
524 MutArray a
486 MutArray a
525−nil = empty
487+nil = MutArray Unboxed.nil 0 0 0
527{-# INLINE newBytesAs #-}
489{-# INLINE newBytesAs #-}
528newBytesAs :: MonadIO m =>
490newBytesAs :: MonadIO m =>
@@ -545,7 +507,6 @@ newBytesAs ps bytes = do
546-- /Pre-release/
508-- /Pre-release/
547{-# INLINE pinnedNewBytes #-}
509{-# INLINE pinnedNewBytes #-}
548−{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
549pinnedNewBytes :: MonadIO m =>
510pinnedNewBytes :: MonadIO m =>
550#ifdef DEVBUILD
511#ifdef DEVBUILD
551 Unbox a =>
512 Unbox a =>
@@ -570,31 +531,21 @@ newAs ps =
570 (error "new: alignment is not used in unpinned arrays.")
531 (error "new: alignment is not used in unpinned arrays.")
572-- XXX can unaligned allocation be more efficient when alignment is not needed?
533-- XXX can unaligned allocation be more efficient when alignment is not needed?
574−-- | Allocates a pinned array of zero length but growable to the specified
535+-- | Allocates an empty pinned array that can hold 'count' items. The memory of
575−-- capacity without reallocation.
536+-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
576−{-# INLINE pinnedEmptyOf #-}
537+-- instance of the type.
577−pinnedEmptyOf :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
538+--
578−pinnedEmptyOf = newAs Pinned
580−-- XXX Deprecate in major
581−-- {-# DEPRECATED pinnedNew "Please use pinnedEmptyOf instead." #-}
582{-# INLINE pinnedNew #-}
539{-# INLINE pinnedNew #-}
583pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
540pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
584−pinnedNew = pinnedEmptyOf
541+pinnedNew = newAs Pinned
586−-- | Allocates an unpinned array of zero length but growable to the specified
543+-- | Allocates an empty unpinned array that can hold 'count' items. The memory
587−-- capacity without reallocation.
544+-- of the array is uninitialized.
589−{-# INLINE emptyOf #-}
590−emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591−emptyOf = newAs Unpinned
593−-- XXX Deprecate in major
594−-- {-# DEPRECATED new "Please use emptyOf instead." #-}
595{-# INLINE new #-}
546{-# INLINE new #-}
596new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
547new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
597−new = emptyOf
548+new = newAs Unpinned
599-------------------------------------------------------------------------------
550-------------------------------------------------------------------------------
600-- Random writes
551-- Random writes
@@ -842,15 +793,15 @@ roundDownTo elemSize size = size - (size `mod` elemSize)
842-- Since this is not inlined Unboxed consrraint leads to dictionary passing
793-- Since this is not inlined Unboxed consrraint leads to dictionary passing
843-- which complicates some inspection tests.
794-- which complicates some inspection tests.
845−{-# NOINLINE reallocExplicitAs #-}
796+{-# NOINLINE reallocExplicit #-}
846−reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
797+reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
847−reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
798+reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
848 assertM(arrEnd <= arrBound)
799 assertM(arrEnd <= arrBound)
850 -- Allocate new array
801 -- Allocate new array
851 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
802 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
852 contents <-
803 contents <-
853− if ps == Pinned
804+ if Unboxed.isPinned arrContents
854 then Unboxed.pinnedNew newCapMaxInBytes
805 then Unboxed.pinnedNew newCapMaxInBytes
855 else Unboxed.new newCapMaxInBytes
806 else Unboxed.new newCapMaxInBytes
856 let !(MutByteArray mbarrFrom#) = arrContents
807 let !(MutByteArray mbarrFrom#) = arrContents
@@ -890,12 +841,7 @@ reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
890-- If the original array is pinned, the newly allocated array is also pinned.
841-- If the original array is pinned, the newly allocated array is also pinned.
891{-# INLINABLE realloc #-}
842{-# INLINABLE realloc #-}
892realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
843realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
898− in liftIO $ reallocExplicitAs ps (SIZE_OF(a)) bytes arr
844+realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
900-- | @reallocWith label capSizer minIncrBytes array@. The label is used
846-- | @reallocWith label capSizer minIncrBytes array@. The label is used
901-- in error messages and the capSizer is used to determine the capacity of the
847-- in error messages and the capSizer is used to determine the capacity of the
@@ -944,7 +890,6 @@ grow nElems arr@MutArray{..} = do
944 else realloc req arr
890 else realloc req arr
946{-# DEPRECATED resize "Please use grow instead." #-}
892{-# DEPRECATED resize "Please use grow instead." #-}
947−{-# INLINE resize #-}
948resize :: forall m a. (MonadIO m, Unbox a) =>
893resize :: forall m a. (MonadIO m, Unbox a) =>
949 Int -> MutArray a -> m (MutArray a)
894 Int -> MutArray a -> m (MutArray a)
950resize = grow
895resize = grow
@@ -968,7 +913,6 @@ growExp nElems arr@MutArray{..} = do
968 else realloc req1 arr
913 else realloc req1 arr
970{-# DEPRECATED resizeExp "Please use growExp instead." #-}
915{-# DEPRECATED resizeExp "Please use growExp instead." #-}
971−{-# INLINE resizeExp #-}
972resizeExp :: forall m a. (MonadIO m, Unbox a) =>
916resizeExp :: forall m a. (MonadIO m, Unbox a) =>
973 Int -> MutArray a -> m (MutArray a)
917 Int -> MutArray a -> m (MutArray a)
974resizeExp = growExp
918resizeExp = growExp
@@ -1302,7 +1246,6 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
1302 D.Stop -> return D.Stop
1246 D.Stop -> return D.Stop
1304{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1248{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1305−{-# INLINE getIndicesWith #-}
1306getIndicesWith :: (Monad m, Unbox a) =>
1249getIndicesWith :: (Monad m, Unbox a) =>
1307 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1250 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
1308getIndicesWith = indexReaderWith
1251getIndicesWith = indexReaderWith
@@ -1318,7 +1261,6 @@ indexReader = indexReaderWith liftIO
1319-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1262-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
1320{-# DEPRECATED getIndices "Please use indexReader instead." #-}
1263{-# DEPRECATED getIndices "Please use indexReader instead." #-}
1321−{-# INLINE getIndices #-}
1322getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1264getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1323getIndices = indexReader
1265getIndices = indexReader
@@ -1615,7 +1557,7 @@ chunksOfAs ps n (D.Stream step state) =
1616-- Same as the following but may be more efficient:
1558-- Same as the following but may be more efficient:
1618−-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
1560+-- >>> chunksOf n = Stream.foldMany (MutArray.writeN n)
1620-- /Pre-release/
1562-- /Pre-release/
1621{-# INLINE_NORMAL chunksOf #-}
1563{-# INLINE_NORMAL chunksOf #-}
@@ -1624,14 +1566,14 @@ chunksOf :: forall m a. (MonadIO m, Unbox a)
1624-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1566-- XXX the idiomatic implementation leads to large regression in the D.reverse'
1625-- benchmark. It seems it has difficulty producing optimized code when
1567-- benchmark. It seems it has difficulty producing optimized code when
1626-- converting to StreamK. Investigate GHC optimizations.
1568-- converting to StreamK. Investigate GHC optimizations.
1627−-- chunksOf n = D.foldMany (createOf n)
1569+-- chunksOf n = D.foldMany (writeN n)
1628chunksOf = chunksOfAs Unpinned
1570chunksOf = chunksOfAs Unpinned
1630-- | Like 'chunksOf' but creates pinned arrays.
1572-- | Like 'chunksOf' but creates pinned arrays.
1631{-# INLINE_NORMAL pinnedChunksOf #-}
1573{-# INLINE_NORMAL pinnedChunksOf #-}
1632pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1574pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
1633 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1575 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1634−-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
1576+-- pinnedChunksOf n = D.foldMany (pinnedWriteN n)
1635pinnedChunksOf = chunksOfAs Pinned
1577pinnedChunksOf = chunksOfAs Pinned
1637-- | When we are buffering a stream of unknown size into an array we do not
1579-- | When we are buffering a stream of unknown size into an array we do not
@@ -1664,10 +1606,16 @@ data FlattenState s contents a =
1664 OuterLoop s
1606 OuterLoop s
1665 | InnerLoop s contents !Int !Int
1607 | InnerLoop s contents !Int !Int
1609+-- | Use the "reader" unfold instead.
1611+-- @concat = unfoldMany reader@
1613+-- We can try this if there are any fusion issues in the unfold.
1667−{-# INLINE_NORMAL concatWith #-}
1615+{-# INLINE_NORMAL concat #-}
1668−concatWith :: forall m a. (Monad m, Unbox a)
1616+concat :: forall m a. (MonadIO m, Unbox a)
1669− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1617+ => D.Stream m (MutArray a) -> D.Stream m a
1670−concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1618+concat (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1684,30 +1632,24 @@ concatWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1684 return $ D.Skip $ OuterLoop st
1632 return $ D.Skip $ OuterLoop st
1686 step' _ (InnerLoop st contents p end) = do
1634 step' _ (InnerLoop st contents p end) = do
1687− x <- liftio $ peekAt p contents
1635+ x <- liftIO $ peekAt p contents
1688 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1636 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
1690−-- | Use the "reader" unfold instead.
1692−-- @concat = unfoldMany reader@
1694−-- We can try this if there are any fusion issues in the unfold.
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
1701{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1638{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1702−{-# INLINE flattenArrays #-}
1703flattenArrays :: forall m a. (MonadIO m, Unbox a)
1639flattenArrays :: forall m a. (MonadIO m, Unbox a)
1704 => D.Stream m (MutArray a) -> D.Stream m a
1640 => D.Stream m (MutArray a) -> D.Stream m a
1705flattenArrays = concat
1641flattenArrays = concat
1643+-- | Use the "readerRev" unfold instead.
1645+-- @concat = unfoldMany readerRev@
1647+-- We can try this if there are any fusion issues in the unfold.
1707−{-# INLINE_NORMAL concatRevWith #-}
1649+{-# INLINE_NORMAL concatRev #-}
1708−concatRevWith :: forall m a. (Monad m, Unbox a)
1650+concatRev :: forall m a. (MonadIO m, Unbox a)
1709− => (forall b. IO b -> m b) -> D.Stream m (MutArray a) -> D.Stream m a
1651+ => D.Stream m (MutArray a) -> D.Stream m a
1710−concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1652+concatRev (D.Stream step state) = D.Stream step' (OuterLoop state)
@@ -1725,23 +1667,11 @@ concatRevWith liftio (D.Stream step state) = D.Stream step' (OuterLoop state)
1725 return $ D.Skip $ OuterLoop st
1667 return $ D.Skip $ OuterLoop st
1727 step' _ (InnerLoop st contents p start) = do
1669 step' _ (InnerLoop st contents p start) = do
1728− x <- liftio $ peekAt p contents
1670+ x <- liftIO $ peekAt p contents
1729 let cur = INDEX_PREV(p,a)
1671 let cur = INDEX_PREV(p,a)
1730 return $ D.Yield x (InnerLoop st contents cur start)
1672 return $ D.Yield x (InnerLoop st contents cur start)
1732−-- | Use the "readerRev" unfold instead.
1734−-- @concat = unfoldMany readerRev@
1736−-- We can try this if there are any fusion issues in the unfold.
1738−{-# INLINE_NORMAL concatRev #-}
1739−concatRev :: forall m a. (MonadIO m, Unbox a)
1740− => D.Stream m (MutArray a) -> D.Stream m a
1741−concatRev = concatRevWith liftIO
1743{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1674{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1744−{-# INLINE flattenArraysRev #-}
1745flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1675flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
1746 => D.Stream m (MutArray a) -> D.Stream m a
1676 => D.Stream m (MutArray a) -> D.Stream m a
1747flattenArraysRev = concatRev
1677flattenArraysRev = concatRev
@@ -1973,7 +1903,7 @@ foldr f z arr = D.foldr f z $ read arr
1974-- XXX Keep the bound intact to not lose any free space? Perf impact?
1904-- XXX Keep the bound intact to not lose any free space? Perf impact?
1976−-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
1906+-- | @writeAppendNUnsafe n arr@ appends up to @n@ input items to the supplied
1977-- array.
1907-- array.
1979-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
1909-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1982,12 +1912,13 @@ foldr f z arr = D.foldr f z $ read arr
1982-- Any free space left in the array after appending @n@ elements is lost.
1912-- Any free space left in the array after appending @n@ elements is lost.
1984-- /Internal/
1914-- /Internal/
1985−{-# INLINE_NORMAL unsafeAppendN #-}
1915+{-# INLINE_NORMAL writeAppendNUnsafe #-}
1986−unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1916+writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1988 -> m (MutArray a)
1918 -> m (MutArray a)
1989 -> Fold m a (MutArray a)
1919 -> Fold m a (MutArray a)
1920+writeAppendNUnsafe n action =
1990−unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
1921+ fmap fromArrayUnsafe $ FL.foldlM' step initial
@@ -2000,7 +1931,7 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
2000 -- otherwise we lose that space.
1931 -- otherwise we lose that space.
2002 if free < needed
1933 if free < needed
2003− then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
1934+ then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
2004 else return arr
1935 else return arr
2005 return $ toArrayUnsafe arr1
1936 return $ toArrayUnsafe arr1
@@ -2008,51 +1939,30 @@ unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
2008 liftIO $ pokeAt end contents x
1939 liftIO $ pokeAt end contents x
2009 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
1940 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2011−{-# DEPRECATED writeAppendNUnsafe "Please use unsafeAppendN instead." #-}
2012−{-# INLINE writeAppendNUnsafe #-}
2013−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
2016− -> Fold m a (MutArray a)
2017−writeAppendNUnsafe = unsafeAppendN
2019-- | Append @n@ elements to an existing array. Any free space left in the array
1942-- | Append @n@ elements to an existing array. Any free space left in the array
2020-- after appending @n@ elements is lost.
1943-- after appending @n@ elements is lost.
2022−-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
1945+-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
2024−{-# INLINE_NORMAL appendN #-}
1947+{-# INLINE_NORMAL writeAppendN #-}
2025−appendN :: forall m a. (MonadIO m, Unbox a) =>
2026− Int -> m (MutArray a) -> Fold m a (MutArray a)
2027−appendN n initial = FL.take n (unsafeAppendN n initial)
2029−-- XXX Deprecate in major
2030−-- {-# DEPRECATED writeAppendN "Please use appendN instead." #-}
2031−{-# INLINE writeAppendN #-}
2032writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
1948writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
2033 Int -> m (MutArray a) -> Fold m a (MutArray a)
1949 Int -> m (MutArray a) -> Fold m a (MutArray a)
2034−writeAppendN = appendN
1950+writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
2036−-- | @appendWith realloc action@ mutates the array generated by @action@ to
1952+-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
2037-- append the input stream. If there is no reserved space available in the
1953-- append the input stream. If there is no reserved space available in the
2038-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
1954-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
2039-- where @oldSize@ is the current size of the array in bytes.
1955-- where @oldSize@ is the current size of the array in bytes.
2041-- Note that the returned array may be a mutated version of original array.
1957-- Note that the returned array may be a mutated version of original array.
2043−-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
1959+-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
2045-- /Pre-release/
1961-- /Pre-release/
2046−{-# INLINE appendWith #-}
2047−appendWith :: forall m a. (MonadIO m, Unbox a) =>
2048− (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2049−appendWith sizer = FL.foldlM' (snocWith sizer)
2051−{-# DEPRECATED writeAppendWith "Please use appendWith instead." #-}
2052{-# INLINE writeAppendWith #-}
1962{-# INLINE writeAppendWith #-}
2053writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
1963writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
2054 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
1964 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
2055−writeAppendWith = appendWith
1965+writeAppendWith sizer = FL.foldlM' (snocWith sizer)
2057-- | @append action@ mutates the array generated by @action@ to append the
1967-- | @append action@ mutates the array generated by @action@ to append the
2058-- input stream. If there is no reserved space available in the array it is
1968-- input stream. If there is no reserved space available in the array it is
@@ -2060,33 +1970,26 @@ writeAppendWith = appendWith
2061-- Note that the returned array may be a mutated version of original array.
1971-- Note that the returned array may be a mutated version of original array.
2063−-- >>> append = MutArray.appendWith (* 2)
1973+-- >>> writeAppend = MutArray.writeAppendWith (* 2)
2065−{-# INLINE append #-}
2066−append :: forall m a. (MonadIO m, Unbox a) =>
2067− m (MutArray a) -> Fold m a (MutArray a)
2068−append = appendWith (* 2)
2070−-- XXX Deprecate in major
2071−-- {-# DEPRECATED writeAppend "Please use append instead." #-}
2072{-# INLINE writeAppend #-}
1975{-# INLINE writeAppend #-}
2073writeAppend :: forall m a. (MonadIO m, Unbox a) =>
1976writeAppend :: forall m a. (MonadIO m, Unbox a) =>
2074 m (MutArray a) -> Fold m a (MutArray a)
1977 m (MutArray a) -> Fold m a (MutArray a)
2075−writeAppend = append
1978+writeAppend = writeAppendWith (* 2)
2077-- XXX We can carry bound as well in the state to make sure we do not lose the
1980-- XXX We can carry bound as well in the state to make sure we do not lose the
2078-- remaining capacity. Need to check perf impact.
1981-- remaining capacity. Need to check perf impact.
2080−-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
1983+-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
2081−-- function as argument.
1984+-- as argument.
2083−-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
1986+-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
2085-- /Pre-release/
1988-- /Pre-release/
2086−{-# INLINE_NORMAL unsafeCreateOfWith #-}
1989+{-# INLINE_NORMAL writeNWithUnsafe #-}
2087−unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
1990+writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2088 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1991 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2089−unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
1992+writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
@@ -2097,64 +2000,40 @@ unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2098 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2001 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
2100−{-# DEPRECATED writeNWithUnsafe "Please use unsafeCreateOfWith instead." #-}
2101−{-# INLINE writeNWithUnsafe #-}
2102−writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2103− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2104−writeNWithUnsafe = unsafeCreateOfWith
2106{-# INLINE_NORMAL writeNUnsafeAs #-}
2003{-# INLINE_NORMAL writeNUnsafeAs #-}
2107writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
2004writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
2108 => PinnedState -> Int -> Fold m a (MutArray a)
2005 => PinnedState -> Int -> Fold m a (MutArray a)
2109−writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
2006+writeNUnsafeAs ps = writeNWithUnsafe (newAs ps)
2111−-- | Like 'createOf' but does not check the array bounds when writing. The fold
2008+-- | Like 'writeN' but does not check the array bounds when writing. The fold
2112-- driver must not call the step function more than 'n' times otherwise it will
2009-- driver must not call the step function more than 'n' times otherwise it will
2113-- corrupt the memory and crash. This function exists mainly because any
2010-- corrupt the memory and crash. This function exists mainly because any
2114-- conditional in the step function blocks fusion causing 10x performance
2011-- conditional in the step function blocks fusion causing 10x performance
2115-- slowdown.
2012-- slowdown.
2117−-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
2014+-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.new
2119−{-# INLINE_NORMAL unsafeCreateOf #-}
2120−unsafeCreateOf :: forall m a. (MonadIO m, Unbox a)
2121− => Int -> Fold m a (MutArray a)
2122−unsafeCreateOf = writeNUnsafeAs Unpinned
2124−{-# DEPRECATED writeNUnsafe "Please use unsafeCreateOf instead." #-}
2125−{-# INLINE writeNUnsafe #-}
2016+{-# INLINE_NORMAL writeNUnsafe #-}
2126writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
2017writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
2127 => Int -> Fold m a (MutArray a)
2018 => Int -> Fold m a (MutArray a)
2128−writeNUnsafe = unsafeCreateOf
2019+writeNUnsafe = writeNUnsafeAs Unpinned
2130−-- | Like 'unsafeCreateOf' but creates a pinned array.
2131−{-# INLINE_NORMAL unsafePinnedCreateOf #-}
2132−unsafePinnedCreateOf :: forall m a. (MonadIO m, Unbox a)
2133− => Int -> Fold m a (MutArray a)
2134−unsafePinnedCreateOf = writeNUnsafeAs Pinned
2136−{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
2021+-- | Like 'writeNUnsafe' but creates a pinned array.
2137−{-# INLINE pinnedWriteNUnsafe #-}
2022+{-# INLINE_NORMAL pinnedWriteNUnsafe #-}
2138pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
2023pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
2139 => Int -> Fold m a (MutArray a)
2024 => Int -> Fold m a (MutArray a)
2140−pinnedWriteNUnsafe = unsafePinnedCreateOf
2025+pinnedWriteNUnsafe = writeNUnsafeAs Pinned
2142−-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
2027+-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
2143-- allocated using the @alloc@ function.
2028-- allocated using the @alloc@ function.
2145−-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
2030+-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
2146−-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
2031+-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
2148−{-# INLINE_NORMAL createOfWith #-}
2033+{-# INLINE_NORMAL writeNWith #-}
2149−createOfWith :: forall m a. (MonadIO m, Unbox a)
2150− => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2151−createOfWith alloc n = FL.take n (unsafeCreateOfWith alloc n)
2153−-- {-# DEPRECATED writeNWith "Please use createOfWith instead." #-}
2154−{-# INLINE writeNWith #-}
2155writeNWith :: forall m a. (MonadIO m, Unbox a)
2034writeNWith :: forall m a. (MonadIO m, Unbox a)
2156 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2035 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2157−writeNWith = createOfWith
2036+writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
2159{-# INLINE_NORMAL writeNAs #-}
2038{-# INLINE_NORMAL writeNAs #-}
2160writeNAs ::
2039writeNAs ::
@@ -2162,42 +2041,28 @@ writeNAs ::
2162 => PinnedState
2041 => PinnedState
2164 -> Fold m a (MutArray a)
2043 -> Fold m a (MutArray a)
2165−writeNAs ps = createOfWith (newAs ps)
2044+writeNAs ps = writeNWith (newAs ps)
2167−-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
2046+-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
2168-- 'MutArray'.
2047-- 'MutArray'.
2170−-- >>> createOf = MutArray.createOfWith MutArray.new
2049+-- >>> writeN = MutArray.writeNWith MutArray.new
2171−-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
2050+-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
2172−-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
2051+-- >>> writeN n = MutArray.writeAppendN n (MutArray.new n)
2174−{-# INLINE_NORMAL createOf #-}
2053+{-# INLINE_NORMAL writeN #-}
2175−createOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2176−createOf = writeNAs Unpinned
2178−-- XXX Deprecate in major
2179−-- {-# DEPRECATED writeN "Please use createOf instead." #-}
2180−{-# INLINE writeN #-}
2181writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2054writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2182−writeN = createOf
2055+writeN = writeNAs Unpinned
2184−-- | Like 'createOf' but creates a pinned array.
2185−{-# INLINE_NORMAL pinnedCreateOf #-}
2187− forall m a. (MonadIO m, Unbox a)
2189− -> Fold m a (MutArray a)
2190−pinnedCreateOf = writeNAs Pinned
2192−{-# DEPRECATED pinnedWriteN "Please use pinnedCreateOf instead." #-}
2057+-- | Like 'writeN' but creates a pinned array.
2193−{-# INLINE pinnedWriteN #-}
2058+{-# INLINE_NORMAL pinnedWriteN #-}
2194pinnedWriteN ::
2059pinnedWriteN ::
2195 forall m a. (MonadIO m, Unbox a)
2060 forall m a. (MonadIO m, Unbox a)
2197 -> Fold m a (MutArray a)
2062 -> Fold m a (MutArray a)
2198−pinnedWriteN = pinnedCreateOf
2063+pinnedWriteN = writeNAs Pinned
2200−-- | Like unsafeCreateOfWith but writes the array in reverse order.
2065+-- | Like writeNWithUnsafe but writes the array in reverse order.
2202-- /Internal/
2067-- /Internal/
2203{-# INLINE_NORMAL writeRevNWithUnsafe #-}
2068{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -2218,7 +2083,7 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2219 $ ArrayUnsafe contents ptr end
2084 $ ArrayUnsafe contents ptr end
2221−-- | Like createOfWith but writes the array in reverse order.
2086+-- | Like writeNWith but writes the array in reverse order.
2223-- /Internal/
2088-- /Internal/
2224{-# INLINE_NORMAL writeRevNWith #-}
2089{-# INLINE_NORMAL writeRevNWith #-}
@@ -2226,36 +2091,31 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
2226 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2091 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
2227writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
2092writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
2229−-- | Like 'createOf' but writes the array in reverse order.
2094+-- | Like writeN but writes the array in reverse order.
2231-- /Pre-release/
2096-- /Pre-release/
2232−{-# INLINE_NORMAL revCreateOf #-}
2097+{-# INLINE_NORMAL writeRevN #-}
2233−revCreateOf :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2234−revCreateOf = writeRevNWith new
2236−{-# DEPRECATED writeRevN "Please use revCreateOf instead." #-}
2237−{-# INLINE writeRevN #-}
2238writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2098writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
2239−writeRevN = revCreateOf
2099+writeRevN = writeRevNWith new
2241-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
2101-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
2242-- input stream to a 'MutArray' aligned to the given size.
2102-- input stream to a 'MutArray' aligned to the given size.
2244−-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
2104+-- >>> pinnedWriteNAligned align = MutArray.writeNWith (MutArray.pinnedNewAligned align)
2245−-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
2105+-- >>> pinnedWriteNAligned align n = MutArray.writeAppendN n (MutArray.pinnedNewAligned align n)
2247-- /Pre-release/
2107-- /Pre-release/
2249{-# INLINE_NORMAL pinnedWriteNAligned #-}
2109{-# INLINE_NORMAL pinnedWriteNAligned #-}
2250pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
2110pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
2251 => Int -> Int -> Fold m a (MutArray a)
2111 => Int -> Int -> Fold m a (MutArray a)
2252−pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
2112+pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
2254-- XXX Buffer to a list instead?
2114-- XXX Buffer to a list instead?
2256-- | Buffer a stream into a stream of arrays.
2116-- | Buffer a stream into a stream of arrays.
2258−-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
2118+-- >>> buildChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
2260-- Breaking an array into an array stream can be useful to consume a large
2120-- Breaking an array into an array stream can be useful to consume a large
2261-- array sequentially such that memory of the array is released incrementatlly.
2121-- array sequentially such that memory of the array is released incrementatlly.
@@ -2267,10 +2127,9 @@ pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
2267{-# INLINE_NORMAL buildChunks #-}
2127{-# INLINE_NORMAL buildChunks #-}
2268buildChunks :: (MonadIO m, Unbox a) =>
2128buildChunks :: (MonadIO m, Unbox a) =>
2269 Int -> Fold m a (StreamK n (MutArray a))
2129 Int -> Fold m a (StreamK n (MutArray a))
2270−buildChunks n = FL.many (createOf n) FL.toStreamK
2130+buildChunks n = FL.many (writeN n) FL.toStreamK
2272{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2132{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273−{-# INLINE writeChunks #-}
2274writeChunks :: (MonadIO m, Unbox a) =>
2133writeChunks :: (MonadIO m, Unbox a) =>
2275 Int -> Fold m a (StreamK n (MutArray a))
2134 Int -> Fold m a (StreamK n (MutArray a))
2276writeChunks = buildChunks
2135writeChunks = buildChunks
@@ -2278,29 +2137,29 @@ writeChunks = buildChunks
2278{-# INLINE_NORMAL writeWithAs #-}
2137{-# INLINE_NORMAL writeWithAs #-}
2279writeWithAs :: forall m a. (MonadIO m, Unbox a)
2138writeWithAs :: forall m a. (MonadIO m, Unbox a)
2280 => PinnedState -> Int -> Fold m a (MutArray a)
2139 => PinnedState -> Int -> Fold m a (MutArray a)
2281−-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
2140+-- writeWithAs ps n = FL.rmapM rightSize $ writeAppendWith (* 2) (newAs ps n)
2282writeWithAs ps elemCount =
2141writeWithAs ps elemCount =
2283 FL.rmapM extract $ FL.foldlM' step initial
2142 FL.rmapM extract $ FL.foldlM' step initial
2287 initial = do
2146 initial = do
2288− when (elemCount < 0) $ error "createWith: elemCount is negative"
2147+ when (elemCount < 0) $ error "writeWith: elemCount is negative"
2289 newAs ps elemCount
2148 newAs ps elemCount
2291 step arr@(MutArray _ start end bound) x
2150 step arr@(MutArray _ start end bound) x
2292 | INDEX_NEXT(end,a) > bound = do
2151 | INDEX_NEXT(end,a) > bound = do
2293 let oldSize = end - start
2152 let oldSize = end - start
2294 newSize = max (oldSize * 2) 1
2153 newSize = max (oldSize * 2) 1
2295− arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
2154+ arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
2296 snocUnsafe arr1 x
2155 snocUnsafe arr1 x
2297 step arr x = snocUnsafe arr x
2156 step arr x = snocUnsafe arr x
2299 extract = liftIO . rightSize
2158 extract = liftIO . rightSize
2301−-- XXX Compare createWith with fromStreamD which uses an array of streams
2160+-- XXX Compare writeWith with fromStreamD which uses an array of streams
2302-- implementation. We can write this using buildChunks above if that is faster.
2161-- implementation. We can write this using buildChunks above if that is faster.
2303−-- If createWith is faster then we should use that to implement
2162+-- If writeWith is faster then we should use that to implement
2304-- fromStreamD.
2163-- fromStreamD.
2306-- XXX The realloc based implementation needs to make one extra copy if we use
2165-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2315,56 +2174,39 @@ writeWithAs ps elemCount =
2315-- XXX check if GHC's memory allocator is efficient enough. We can try the C
2174-- XXX check if GHC's memory allocator is efficient enough. We can try the C
2316-- malloc to compare against.
2175-- malloc to compare against.
2318−-- | @createWith minCount@ folds the whole input to a single array. The array
2177+-- | @writeWith minCount@ folds the whole input to a single array. The array
2319-- starts at a size big enough to hold minCount elements, the size is doubled
2178-- starts at a size big enough to hold minCount elements, the size is doubled
2320-- every time the array needs to be grown.
2179-- every time the array needs to be grown.
2322-- /Caution! Do not use this on infinite streams./
2181-- /Caution! Do not use this on infinite streams./
2324−-- >>> f n = MutArray.appendWith (* 2) (MutArray.emptyOf n)
2183+-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.new n)
2325−-- >>> createWith n = Fold.rmapM MutArray.rightSize (f n)
2184+-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
2326−-- >>> createWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
2185+-- >>> writeWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
2328-- /Pre-release/
2187-- /Pre-release/
2329−{-# INLINE_NORMAL createWith #-}
2188+{-# INLINE_NORMAL writeWith #-}
2330−createWith :: forall m a. (MonadIO m, Unbox a)
2331− => Int -> Fold m a (MutArray a)
2332−-- createWith n = FL.rmapM rightSize $ appendWith (* 2) (emptyOf n)
2333−createWith = writeWithAs Unpinned
2335−{-# DEPRECATED writeWith "Please use createWith instead." #-}
2336−{-# INLINE writeWith #-}
2337writeWith :: forall m a. (MonadIO m, Unbox a)
2189writeWith :: forall m a. (MonadIO m, Unbox a)
2338 => Int -> Fold m a (MutArray a)
2190 => Int -> Fold m a (MutArray a)
2339−writeWith = createWith
2191+-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (new n)
2192+writeWith = writeWithAs Unpinned
2341-- | Fold the whole input to a single array.
2194-- | Fold the whole input to a single array.
2343−-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
2196+-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
2344-- rounded up to the element size.
2197-- rounded up to the element size.
2346-- /Caution! Do not use this on infinite streams./
2199-- /Caution! Do not use this on infinite streams./
2348−{-# INLINE create #-}
2349−create :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2350−create = createWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2352−-- XXX Deprecate in major
2353−-- {-# DEPRECATED write "Please use create instead." #-}
2354{-# INLINE write #-}
2201{-# INLINE write #-}
2355write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2202write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2356−write = create
2203+write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2358−-- | Like 'create' but creates a pinned array.
2205+-- | Like 'write' but creates a pinned array.
2359−{-# INLINE pinnedCreate #-}
2360−pinnedCreate :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2362− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2364−{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
2365{-# INLINE pinnedWrite #-}
2206{-# INLINE pinnedWrite #-}
2366pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2207pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2367−pinnedWrite = pinnedCreate
2208+pinnedWrite =
2209+ writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2369-------------------------------------------------------------------------------
2211-------------------------------------------------------------------------------
2370-- construct from streams, known size
2212-- construct from streams, known size
@@ -2384,18 +2226,17 @@ fromStreamDNAs ps limit str = do
2384 liftIO $ pokeAt ptr arrContents x
2226 liftIO $ pokeAt ptr arrContents x
2385 return $ INDEX_NEXT(ptr,a)
2227 return $ INDEX_NEXT(ptr,a)
2387−-- | Use the 'createOf' fold instead.
2229+-- | Use the 'writeN' fold instead.
2389−-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
2231+-- >>> fromStreamN n = Stream.fold (MutArray.writeN n)
2391{-# INLINE_NORMAL fromStreamN #-}
2233{-# INLINE_NORMAL fromStreamN #-}
2392fromStreamN :: forall m a. (MonadIO m, Unbox a)
2234fromStreamN :: forall m a. (MonadIO m, Unbox a)
2393 => Int -> D.Stream m a -> m (MutArray a)
2235 => Int -> D.Stream m a -> m (MutArray a)
2394−-- fromStreamDN n = D.fold (createOf n)
2236+-- fromStreamDN n = D.fold (writeN n)
2395fromStreamN = fromStreamDNAs Unpinned
2237fromStreamN = fromStreamDNAs Unpinned
2397{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2239{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398−{-# INLINE fromStreamDN #-}
2399fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2240fromStreamDN :: forall m a. (MonadIO m, Unbox a)
2400 => Int -> D.Stream m a -> m (MutArray a)
2241 => Int -> D.Stream m a -> m (MutArray a)
2401fromStreamDN = fromStreamN
2242fromStreamDN = fromStreamN
@@ -2418,20 +2259,20 @@ pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
2418-- /Pre-release/
2259-- /Pre-release/
2419{-# INLINE fromListRevN #-}
2260{-# INLINE fromListRevN #-}
2420fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2261fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2421−fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
2262+fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
2423-- | Convert a pure stream in Identity monad to a mutable array.
2264-- | Convert a pure stream in Identity monad to a mutable array.
2424{-# INLINABLE fromPureStreamN #-}
2265{-# INLINABLE fromPureStreamN #-}
2425fromPureStreamN :: (MonadIO m, Unbox a) =>
2266fromPureStreamN :: (MonadIO m, Unbox a) =>
2426 Int -> Stream Identity a -> m (MutArray a)
2267 Int -> Stream Identity a -> m (MutArray a)
2427fromPureStreamN n xs =
2268fromPureStreamN n xs =
2428− D.fold (createOf n) $ D.morphInner (return . runIdentity) xs
2269+ D.fold (writeN n) $ D.morphInner (return . runIdentity) xs
2430-- | Convert a pure stream in Identity monad to a mutable array.
2271-- | Convert a pure stream in Identity monad to a mutable array.
2431{-# INLINABLE fromPureStream #-}
2272{-# INLINABLE fromPureStream #-}
2432fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2273fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
2433fromPureStream xs =
2274fromPureStream xs =
2434− D.fold create $ D.morphInner (return . runIdentity) xs
2275+ D.fold write $ D.morphInner (return . runIdentity) xs
2436{-# INLINABLE fromPtrN #-}
2277{-# INLINABLE fromPtrN #-}
2437fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
2278fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
@@ -2440,7 +2281,7 @@ fromPtrN len addr = do
2440 -- XXX We can implement a stream copy in a similar way by streaming Word64
2281 -- XXX We can implement a stream copy in a similar way by streaming Word64
2441 -- first and then remaining Word8.
2282 -- first and then remaining Word8.
2442 arr <- new len
2283 arr <- new len
2443− _ <- unsafeAsPtr arr
2284+ _ <- asUnpinnedPtrUnsafe arr
2444 (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2285 (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
2445 return (arr {arrEnd = len})
2286 return (arr {arrEnd = len})
@@ -2456,7 +2297,7 @@ fromByteStr# addr = do
2456 len <- liftIO $ c_strlen (Ptr addr)
2297 len <- liftIO $ c_strlen (Ptr addr)
2457 let lenInt = fromIntegral len
2298 let lenInt = fromIntegral len
2458 arr <- new lenInt
2299 arr <- new lenInt
2459− _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2300+ _ <- asUnpinnedPtrUnsafe arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2460 return (arr {arrEnd = lenInt})
2301 return (arr {arrEnd = lenInt})
2462-------------------------------------------------------------------------------
2303-------------------------------------------------------------------------------
@@ -2515,7 +2356,6 @@ fromChunksK :: (Unbox a, MonadIO m) =>
2515fromChunksK = fromChunkskAs Unpinned
2356fromChunksK = fromChunkskAs Unpinned
2517{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2358{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2518−{-# INLINE fromArrayStreamK #-}
2519fromArrayStreamK :: (Unbox a, MonadIO m) =>
2359fromArrayStreamK :: (Unbox a, MonadIO m) =>
2520 StreamK m (MutArray a) -> m (MutArray a)
2360 StreamK m (MutArray a) -> m (MutArray a)
2521fromArrayStreamK = fromChunksK
2361fromArrayStreamK = fromChunksK
@@ -2527,7 +2367,7 @@ fromStreamDAs ps m =
2527 arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2367 arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
2529-- | Create an 'Array' from a stream. This is useful when we want to create a
2369-- | 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
2370+-- single array from a stream of unknown size. 'writeN' is at least twice
2531-- as efficient when the size is already known.
2371-- as efficient when the size is already known.
2533-- Note that if the input stream is too large memory allocation for the array
2373-- Note that if the input stream is too large memory allocation for the array
@@ -2539,19 +2379,19 @@ fromStreamDAs ps m =
2539fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2379fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
2540fromStream = fromStreamDAs Unpinned
2380fromStream = fromStreamDAs Unpinned
2542−-- fromStream (Stream m) = P.fold create m
2382+-- fromStream (Stream m) = P.fold write m
2543-- CAUTION: a very large number (millions) of arrays can degrade performance
2383-- CAUTION: a very large number (millions) of arrays can degrade performance
2544-- due to GC overhead because we need to buffer the arrays before we flatten
2384-- due to GC overhead because we need to buffer the arrays before we flatten
2545-- all the arrays.
2385-- all the arrays.
2547−-- XXX Compare if this is faster or "fold create".
2387+-- XXX Compare if this is faster or "fold write".
2549-- | We could take the approach of doubling the memory allocation on each
2389-- | We could take the approach of doubling the memory allocation on each
2550-- overflow. This would result in more or less the same amount of copying as in
2390-- overflow. This would result in more or less the same amount of copying as in
2551-- the chunking approach. However, if we have to shrink in the end then it may
2391-- the chunking approach. However, if we have to shrink in the end then it may
2552-- result in an extra copy of the entire data.
2392-- result in an extra copy of the entire data.
2554−-- >>> fromStreamD = StreamD.fold MutArray.create
2394+-- >>> fromStreamD = StreamD.fold MutArray.write
2556{-# INLINE fromStreamD #-}
2396{-# INLINE fromStreamD #-}
2557{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
2397{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
@@ -2581,10 +2421,6 @@ fromListRev xs = fromListRevN (Prelude.length xs) xs
2581-- Cloning
2421-- Cloning
2582-------------------------------------------------------------------------------
2422-------------------------------------------------------------------------------
2584−-- Arrays are aligned on 64-bit boundaries. The fastest way to copy an array is
2585−-- to unsafeCast it to Word64, read it, write it to Word64 array and unsafeCast
2586−-- it again. We can use SIMD read/write as well.
2588{-# INLINE cloneAs #-}
2424{-# INLINE cloneAs #-}
2589cloneAs ::
2425cloneAs ::
2590 ( MonadIO m
2426 ( MonadIO m
@@ -2676,7 +2512,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
2676 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2512 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
2677spliceWith sizer dst@(MutArray _ start end bound) src = do
2513spliceWith sizer dst@(MutArray _ start end bound) src = do
2679− let f = appendWith (`sizer` byteLength src) (return dst)
2515+ let f = writeAppendWith (`sizer` byteLength src) (return dst)
2680 in D.fold f (toStreamD src)
2516 in D.fold f (toStreamD src)
2682 assert (end <= bound) (return ())
2518 assert (end <= bound) (return ())
@@ -2744,7 +2580,7 @@ splitOn predicate arr =
2744{-# INLINE breakOn #-}
2580{-# INLINE breakOn #-}
2745breakOn :: MonadIO m
2581breakOn :: MonadIO m
2746 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2582 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2747−breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2583+breakOn sep arr@MutArray{..} = asUnpinnedPtrUnsafe arr $ \p -> liftIO $ do
2748 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2584 -- XXX We do not need memchr here, we can use a Haskell equivalent.
2749 -- Need efficient stream based primitives that work on Word64.
2585 -- Need efficient stream based primitives that work on Word64.
2750 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
2586 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
@@ -2767,41 +2603,33 @@ breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
2770−-- | Like 'splitAt' but does not check whether the index is valid.
2772−{-# INLINE unsafeSplitAt #-}
2773−unsafeSplitAt :: forall a. Unbox a =>
2774− Int -> MutArray a -> (MutArray a, MutArray a)
2775−unsafeSplitAt i MutArray{..} =
2776− let off = i * SIZE_OF(a)
2779− { arrContents = arrContents
2780− , arrStart = arrStart
2785− { arrContents = arrContents
2788− , arrBound = arrBound
2792-- | Create two slices of an array without copying the original array. The
2606-- | Create two slices of an array without copying the original array. The
2793-- specified index @i@ is the first index of the second slice.
2607-- specified index @i@ is the first index of the second slice.
2795{-# INLINE splitAt #-}
2609{-# INLINE splitAt #-}
2796splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2610splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2797−splitAt i arr =
2611+splitAt i arr@MutArray{..} =
2798 let maxIndex = length arr - 1
2612 let maxIndex = length arr - 1
2799 in if i < 0
2613 in if i < 0
2800 then error "sliceAt: negative array index"
2614 then error "sliceAt: negative array index"
2801 else if i > maxIndex
2615 else if i > maxIndex
2802 then error $ "sliceAt: specified array index " ++ show i
2616 then error $ "sliceAt: specified array index " ++ show i
2803 ++ " is beyond the maximum index " ++ show maxIndex
2617 ++ " is beyond the maximum index " ++ show maxIndex
2804− else unsafeSplitAt i arr
2618+ else let off = i * SIZE_OF(a)
2621+ { arrContents = arrContents
2622+ , arrStart = arrStart
2627+ { arrContents = arrContents
2630+ , arrBound = arrBound
2806-------------------------------------------------------------------------------
2634-------------------------------------------------------------------------------
2807-- Casting
2635-- Casting
@@ -2851,13 +2679,9 @@ cast arr =
2851-- guarantees that unsafe calls will be performed in the calling thread. Making
2679-- guarantees that unsafe calls will be performed in the calling thread. Making
2852-- it safe to pass heap-allocated objects to unsafe functions.
2680-- it safe to pass heap-allocated objects to unsafe functions.
2854−-- XXX Should we just name it asPtr, the unsafety is implicit for any pointer
2682+-- 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
2683-- operations. And we are safe from Haskell perspective because we will be
2856-- pinning the memory.
2684-- pinning the memory.
2858−-- XXX we cannot pass the length of the ptr here as in some cases it may not be
2859−-- available e.g. a null terminated C string. However, we can create another
2860−-- flavor of the API e.g. asPtrN.
2862-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
2686-- | 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.
2687-- array as a pointer to some operating system call or to a "safe" FFI call.
@@ -2875,21 +2699,16 @@ cast arr =
2876-- /Pre-release/
2700-- /Pre-release/
2878−{-# INLINE unsafePinnedAsPtr #-}
2879−unsafePinnedAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2880−unsafePinnedAsPtr arr f =
2881− Unboxed.unsafePinnedAsPtr
2882− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2884−{-# DEPRECATED asPtrUnsafe "Please use unsafePinnedAsPtr instead." #-}
2885{-# INLINE asPtrUnsafe #-}
2702{-# INLINE asPtrUnsafe #-}
2886asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2703asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2887−asPtrUnsafe = unsafePinnedAsPtr
2704+asPtrUnsafe arr f =
2705+ Unboxed.asPtrUnsafe
2706+ (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2889−{-# INLINE unsafeAsPtr #-}
2708+{-# INLINE asUnpinnedPtrUnsafe #-}
2890−unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2709+asUnpinnedPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2891−unsafeAsPtr arr f =
2710+asUnpinnedPtrUnsafe arr f =
2892− Unboxed.unsafeAsPtr
2711+ Unboxed.asUnpinnedPtrUnsafe
2893 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2712 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2895-------------------------------------------------------------------------------
2714-------------------------------------------------------------------------------
@@ -2951,11 +2770,19 @@ byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
2951-- can leave some memory unused. They can split the last array to fit it
2770-- can leave some memory unused. They can split the last array to fit it
2952-- exactly in the space.
2771-- exactly in the space.
2773+-- | Parser @pCompactLE maxElems@ coalesces adjacent arrays in the input stream
2774+-- only if the combined size would be less than or equal to @maxElems@
2775+-- elements. Note that it won't split an array if the original array is already
2776+-- larger than maxElems.
2778+-- @maxElems@ must be greater than 0.
2954−{-# INLINE_NORMAL pCompactLeAs #-}
2781+{-# INLINE_NORMAL pCompactLE #-}
2955−pCompactLeAs ::
2782+pCompactLE ::
2956 forall m a. (MonadIO m, Unbox a)
2783 forall m a. (MonadIO m, Unbox a)
2957− => PinnedState -> Int -> Parser (MutArray a) m (MutArray a)
2784+ => Int -> Parser (MutArray a) m (MutArray a)
2958−pCompactLeAs ps maxElems = Parser step initial extract
2785+pCompactLE maxElems = Parser step initial extract
@@ -2986,8 +2813,7 @@ pCompactLeAs ps maxElems = Parser step initial extract
2988 if byteCapacity buf < maxBytes
2815 if byteCapacity buf < maxBytes
2989− then liftIO $ reallocExplicitAs
2990− ps (SIZE_OF(a)) maxBytes buf
2816+ then realloc maxBytes buf
2991 else return buf
2817 else return buf
2992 buf2 <- spliceUnsafe buf1 arr
2818 buf2 <- spliceUnsafe buf1 arr
2993 return $ Parser.Partial 0 (Just buf2)
2819 return $ Parser.Partial 0 (Just buf2)
@@ -2995,30 +2821,6 @@ pCompactLeAs ps maxElems = Parser step initial extract
2995 extract Nothing = return $ Parser.Done 0 nil
2821 extract Nothing = return $ Parser.Done 0 nil
2996 extract (Just buf) = return $ Parser.Done 0 buf
2822 extract (Just buf) = return $ Parser.Done 0 buf
2998−-- | Parser @pCompactLE maxElems@ coalesces adjacent arrays in the input stream
2999−-- only if the combined size would be less than or equal to @maxElems@
3000−-- elements. Note that it won't split an array if the original array is already
3001−-- larger than maxElems.
3003−-- @maxElems@ must be greater than 0.
3005−-- Generates unpinned arrays irrespective of the pinning status of input
3009−{-# INLINE pCompactLE #-}
3011− forall m a. (MonadIO m, Unbox a)
3012− => Int -> Parser (MutArray a) m (MutArray a)
3013−pCompactLE = pCompactLeAs Unpinned
3015−-- | Pinned version of 'pCompactLE'.
3016−{-# INLINE pPinnedCompactLE #-}
3018− forall m a. (MonadIO m, Unbox a)
3019− => Int -> Parser (MutArray a) m (MutArray a)
3020−pPinnedCompactLE = pCompactLeAs Pinned
3022data SpliceState s arr
2824data SpliceState s arr
3023 = SpliceInitial s
2825 = SpliceInitial s
3024 | SpliceBuffering s arr
2826 | SpliceBuffering s arr
@@ -3030,10 +2832,18 @@ data SpliceState s arr
3030-- immutable array never has additional space so a new array is allocated
2832-- immutable array never has additional space so a new array is allocated
3031-- instead of mutating it.
2833-- instead of mutating it.
2835+-- | Scan @rCompactLE maxElems@ coalesces adjacent arrays in the input stream
2836+-- only if the combined size would be less than or equal to @maxElems@
2837+-- elements. Note that it won't split an array if the original array is already
2838+-- larger than maxElems.
2840+-- @maxElems@ must be greater than 0.
3033−{-# INLINE_NORMAL compactLeAs #-}
2843+{-# INLINE_NORMAL rCompactLE #-}
3034−compactLeAs :: forall m a. (MonadIO m, Unbox a)
2844+rCompactLE :: forall m a. (MonadIO m, Unbox a)
3035− => PinnedState -> Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
2845+ => Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
3036−compactLeAs ps maxElems (D.Stream step state) =
2846+rCompactLE maxElems (D.Stream step state) =
3037 D.Stream step' (SpliceInitial state)
2847 D.Stream step' (SpliceInitial state)
@@ -3069,8 +2879,7 @@ compactLeAs ps maxElems (D.Stream step state) =
3069 D.Skip (SpliceYielding buf (SpliceBuffering s arr))
2879 D.Skip (SpliceYielding buf (SpliceBuffering s arr))
3071 buf1 <- if byteCapacity buf < maxBytes
2881 buf1 <- if byteCapacity buf < maxBytes
3072− then liftIO $ reallocExplicitAs
3073− ps (SIZE_OF(a)) maxBytes buf
2882+ then realloc maxBytes buf
3074 else return buf
2883 else return buf
3075 buf2 <- spliceUnsafe buf1 arr
2884 buf2 <- spliceUnsafe buf1 arr
3076 return $ D.Skip (SpliceBuffering s buf2)
2885 return $ D.Skip (SpliceBuffering s buf2)
@@ -3081,12 +2890,14 @@ compactLeAs ps maxElems (D.Stream step state) =
3082 step' _ (SpliceYielding arr next) = return $ D.Yield arr next
2891 step' _ (SpliceYielding arr next) = return $ D.Yield arr next
3084−
2893+-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
2894+-- until the size becomes greater than or equal to @minElems@.
3085−{-# INLINE_NORMAL fCompactGeAs #-}
2896+{-# INLINE_NORMAL fCompactGE #-}
3086−fCompactGeAs ::
2897+fCompactGE ::
3087 forall m a. (MonadIO m, Unbox a)
2898 forall m a. (MonadIO m, Unbox a)
3088− => PinnedState -> Int -> FL.Fold m (MutArray a) (MutArray a)
2899+ => Int -> FL.Fold m (MutArray a) (MutArray a)
3089−fCompactGeAs ps minElems = Fold step initial extract extract
2900+fCompactGE minElems = Fold step initial extract extract
@@ -3114,8 +2925,7 @@ fCompactGeAs ps minElems = Fold step initial extract extract
3114 let len = byteLength buf + byteLength arr
2925 let len = byteLength buf + byteLength arr
3116 if byteCapacity buf < len
2927 if byteCapacity buf < len
3117− then liftIO $ reallocExplicitAs
3118− ps (SIZE_OF(a)) (max minBytes len) buf
2928+ then realloc (max len minBytes) buf
3119 else return buf
2929 else return buf
3120 buf2 <- spliceUnsafe buf1 arr
2930 buf2 <- spliceUnsafe buf1 arr
3121 if len >= minBytes
2931 if len >= minBytes
@@ -3125,30 +2935,15 @@ fCompactGeAs ps minElems = Fold step initial extract extract
3125 extract Nothing = return nil
2935 extract Nothing = return nil
3126 extract (Just buf) = return buf
2936 extract (Just buf) = return buf
3128−-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
2938+-- | Like 'compactGE' but for transforming folds instead of stream.
3129−-- until the size becomes greater than or equal to @minElems@.
3131−-- Generates unpinned arrays irrespective of the pinning status of input
2940+-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3133−{-# INLINE fCompactGE #-}
3135− forall m a. (MonadIO m, Unbox a)
3136− => Int -> FL.Fold m (MutArray a) (MutArray a)
3137−fCompactGE = fCompactGeAs Unpinned
3139−-- | Pinned version of 'fCompactGE'.
3140−{-# INLINE fPinnedCompactGE #-}
3142− forall m a. (MonadIO m, Unbox a)
3143− => Int -> FL.Fold m (MutArray a) (MutArray a)
3144−fPinnedCompactGE = fCompactGeAs Pinned
3146−{-# INLINE_NORMAL lCompactGeAs #-}
2942+{-# INLINE_NORMAL lCompactGE #-}
3147−lCompactGeAs :: forall m a. (MonadIO m, Unbox a)
2943+lCompactGE :: forall m a. (MonadIO m, Unbox a)
3148− => PinnedState -> Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
2944+ => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3149−-- The fold version turns out to be a little bit slower.
2945+-- lCompactGE n = Fold.many (fCompactGE n)
3150−-- lCompactGeAs ps n = FL.many (fCompactGeAs ps n)
3151−lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
2946+lCompactGE minElems (Fold step1 initial1 _ final1) =
3152 Fold step initial extract final
2947 Fold step initial extract final
@@ -3186,8 +2981,7 @@ lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
3186 step (Tuple' (Just buf) r1) arr = do
2981 step (Tuple' (Just buf) r1) arr = do
3187 let len = byteLength buf + byteLength arr
2982 let len = byteLength buf + byteLength arr
3188 buf1 <- if byteCapacity buf < len
2983 buf1 <- if byteCapacity buf < len
3189− then liftIO $ reallocExplicitAs
3190− ps (SIZE_OF(a)) (max minBytes len) buf
2984+ then realloc (max minBytes len) buf
3191 else return buf
2985 else return buf
3192 buf2 <- spliceUnsafe buf1 arr
2986 buf2 <- spliceUnsafe buf1 arr
3193 runInner len r1 buf2
2987 runInner len r1 buf2
@@ -3207,23 +3001,6 @@ lCompactGeAs ps minElems (Fold step1 initial1 _ final1) =
3207 FL.Partial rr -> final1 rr
3001 FL.Partial rr -> final1 rr
3208 FL.Done _ -> return ()
3002 FL.Done _ -> return ()
3210−-- | Like 'compactGE' but for transforming folds instead of stream.
3212−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3214−-- Generates unpinned arrays irrespective of the pinning status of input
3216−{-# INLINE lCompactGE #-}
3217−lCompactGE :: forall m a. (MonadIO m, Unbox a)
3218− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3219−lCompactGE = lCompactGeAs Unpinned
3221−-- | Pinned version of 'lCompactGE'.
3222−{-# INLINE lPinnedCompactGE #-}
3223−lPinnedCompactGE :: forall m a. (MonadIO m, Unbox a)
3224− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
3225−lPinnedCompactGE = lCompactGeAs Pinned
3227-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3004-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
3228-- the size becomes greater than or equal to @n@.
3005-- the size becomes greater than or equal to @n@.