@@ -40,22 +40,22 @@ module Streamly.Internal.Data.MutArray.Type
4040
4141 -- ** Casting
4242 , cast
43− , castUnsafe
43+ , castUnsafe -- XXX unsafeCast
4444 , asBytes
45− , asPtrUnsafe
46− , asUnpinnedPtrUnsafe
45+ , unsafePinnedAsPtr
46+ , unsafeAsPtr
4747
4848 -- ** Construction
49− , nil
49+ , empty
5050
5151 -- *** New
5252 -- | New arrays are always empty arrays with some reserve capacity to
5353 -- extend the length without reallocating.
54− , new
55− , newArrayWith
56− , pinnedNew
57− , pinnedNewBytes
58− , pinnedNewAligned
54+ , emptyOf
55+ , newArrayWith -- emptyAlignedWith
56+ , pinnedEmptyOf
57+ , pinnedNewAligned -- XXX not required
58+ -- , new -- uninitialized array of specified length
5959
6060 -- *** Cloning
6161 , clone
@@ -63,27 +63,25 @@ module Streamly.Internal.Data.MutArray.Type
6363
6464 -- *** Slicing
6565 -- | Get a subarray without copying
66− , getSliceUnsafe
66+ , getSliceUnsafe -- XXX unsafeGetSlice
6767 , getSlice
6868 , splitAt -- XXX should be able to express using getSlice
6969 , breakOn
7070
7171 -- *** Stream Folds
7272 , ArrayUnsafe (..)
73− , writeNWithUnsafe
74− , writeNWith
75− , writeNUnsafe
76− , pinnedWriteNUnsafe
77− , writeN
78− , pinnedWriteN
79− , pinnedWriteNAligned
80−
81− , writeWith
82− , write
83− , pinnedWrite
84−
85− , writeRevN
86− -- , writeRev
73+ , unsafeCreateOfWith
74+ , unsafeCreateOf
75+ , unsafePinnedCreateOf
76+ , pinnedCreateOf
77+ , createOfWith
78+ , createOf
79+ , revCreateOf
80+
81+ , pinnedCreate
82+ , createWith
83+ , create
84+ -- , revCreate
8785
8886 -- *** From containers
8987 , fromListN
@@ -99,11 +97,11 @@ module Streamly.Internal.Data.MutArray.Type
9997 , fromByteStr#
10098 , fromPtrN
10199 , fromChunksK
102− , fromChunksRealloced
100+ , fromChunksRealloced -- fromSmallChunks
103101
104102 -- ** Random writes
105103 , putIndex
106− , putIndexUnsafe
104+ , putIndexUnsafe -- XXX unsafePutIndex
107105 , putIndices
108106 -- , putFromThenTo
109107 -- , putFrom -- start writing at the given position
@@ -111,7 +109,7 @@ module Streamly.Internal.Data.MutArray.Type
111109 -- , putFromTo
112110 -- , putFromRev
113111 -- , putUptoRev
114− , modifyIndexUnsafe
112+ , modifyIndexUnsafe -- XXX unsafeModifyIndex
115113 , modifyIndex
116114 , modifyIndices
117115 , modify
@@ -122,9 +120,9 @@ module Streamly.Internal.Data.MutArray.Type
122120
123121 -- *** Indexing
124122 , getIndex
125− , getIndexUnsafe
123+ , getIndexUnsafe -- XXX unsafeGetIndex
126124 -- , getFromThenTo
127− , getIndexRev
125+ , getIndexRev -- getRevIndex?
128126 , indexReader
129127 , indexReaderWith
130128
@@ -164,9 +162,9 @@ module Streamly.Internal.Data.MutArray.Type
164162 , blockSize
165163 , arrayChunkBytes
166164 , allocBytesToElemCount
167− , realloc
168− , resize
169− , resizeExp
165+ , realloc -- this is "resize"
166+ , grow
167+ , growExp
170168 , rightSize
171169
172170 -- ** Folding
@@ -195,24 +193,34 @@ module Streamly.Internal.Data.MutArray.Type
195193 , snoc
196194 , snocLinear
197195 , snocMay
198− , snocUnsafe
196+ , snocUnsafe -- XXX unsafeSnoc
199197
200198 -- *** Appending streams
201− , writeAppendNUnsafe
202− , writeAppendN
203− , writeAppendWith
204− , writeAppend
199+ , unsafeAppendN
200+ , appendN
201+ , appendWith
202+ , append
205203
206204 -- *** Appending arrays
207205 , spliceCopy
208206 , spliceWith
209207 , splice
210208 , spliceExp
211− , spliceUnsafe
209+ , spliceUnsafe -- XXX unsafeSplice
212210 -- , putSlice
213211 -- , appendSlice
214212 -- , appendSliceFrom
215213
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+
216224 -- Arrays of arrays
217225 -- We can add dimensionality parameter to the array type to get
218226 -- multidimensional arrays. Multidimensional arrays would just be a
@@ -234,6 +242,8 @@ module Streamly.Internal.Data.MutArray.Type
234242
235243 -- *** Concat
236244 -- | Append the arrays in a stream to form a stream of elements.
245+ , concatWith
246+ , concatRevWith
237247 , concat
238248 , concatRev
239249
@@ -241,9 +251,12 @@ module Streamly.Internal.Data.MutArray.Type
241251 -- | Append the arrays in a stream to form a stream of larger arrays.
242252 , SpliceState (..)
243253 , pCompactLE
244− , rCompactLE
254+ , pPinnedCompactLE
255+ , compactLeAs
245256 , fCompactGE
257+ , fPinnedCompactGE
246258 , lCompactGE
259+ , lPinnedCompactGE
247260 , compactGE
248261 , compactEQ
249262
@@ -254,6 +267,7 @@ module Streamly.Internal.Data.MutArray.Type
254267 , c_memchr
255268
256269 -- * Deprecated
270+ , asPtrUnsafe
257271 , writeChunks
258272 , flattenArrays
259273 , flattenArraysRev
@@ -263,6 +277,27 @@ module Streamly.Internal.Data.MutArray.Type
263277 , cmp
264278 , getIndices
265279 , 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
266301 )
267302where
268303
@@ -444,6 +479,8 @@ isPinned MutArray{..} = Unboxed.isPinned arrContents
444479-- we need more than that. See stg_pinnedNewAlignedByteArrayzh and
445480-- allocatePinned in GHC source.
446481
482+-- XXX Rename to emptyAlignedWith, alignSize should be first arg.
483+
447484-- | @newArrayWith allocator alignment count@ allocates a new array of zero
448485-- length and with a capacity to hold @count@ elements, using @allocator
449486-- size alignment@ as the memory allocator function.
@@ -467,12 +504,25 @@ newArrayWith alloc alignSize count = do
467504 , arrBound = size
468505 }
469506
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." #-}
470520nil ::
471521#ifdef DEVBUILD
472522 Unbox a =>
473523#endif
474524 MutArray a
475−nil = MutArray Unboxed.nil 0 0 0
525+nil = empty
476526
477527{-# INLINE newBytesAs #-}
478528newBytesAs :: MonadIO m =>
@@ -489,12 +539,13 @@ newBytesAs ps bytes = do
489539 , arrBound = bytes
490540 }
491541
492−-- | Allocates a pinned empty array that can hold 'count' items. The memory of
493−-- the array is uninitialized and the allocation is aligned as per the
494−-- 'Unboxed' instance of the type.
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.
495545--
496546-- /Pre-release/
497547{-# INLINE pinnedNewBytes #-}
548+{-# DEPRECATED pinnedNewBytes "Please use pinnedEmptyOf with appropriate calculation" #-}
498549pinnedNewBytes :: MonadIO m =>
499550#ifdef DEVBUILD
500551 Unbox a =>
@@ -519,21 +570,31 @@ newAs ps =
519570 (error "new: alignment is not used in unpinned arrays.")
520571
521572-- XXX can unaligned allocation be more efficient when alignment is not needed?
522−--
523−-- | Allocates an empty pinned array that can hold 'count' items. The memory of
524−-- the array is uninitialized and the allocation is aligned as per the 'Unboxed'
525−-- instance of the type.
526−--
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." #-}
527582{-# INLINE pinnedNew #-}
528583pinnedNew :: forall m a. (MonadIO m, Unbox a) => Int -> m (MutArray a)
529−pinnedNew = newAs Pinned
584+pinnedNew = pinnedEmptyOf
530585
531−-- | Allocates an empty unpinned array that can hold 'count' items. The memory
532−-- of the array is uninitialized.
586+-- | Allocates an unpinned array of zero length but growable to the specified
587+-- capacity without reallocation.
533588--
589+{-# INLINE emptyOf #-}
590+emptyOf :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
591+emptyOf = newAs Unpinned
592+
593+-- XXX Deprecate in major
594+-- {-# DEPRECATED new "Please use emptyOf instead." #-}
534595{-# INLINE new #-}
535596new :: (MonadIO m, Unbox a) => Int -> m (MutArray a)
536−new = newAs Unpinned
597+new = emptyOf
537598
538599-------------------------------------------------------------------------------
539600-- Random writes
@@ -581,7 +642,7 @@ putIndices arr = FL.foldlM' step (return ())
581642
582643 where
583644
584− step () (i, x) = liftIO (putIndex i arr x)
645+ step () (i, x) = putIndex i arr x
585646
586647-- | Modify a given index of an array using a modifier function.
587648--
@@ -777,22 +838,19 @@ arrayChunkBytes = 1024
777838roundDownTo :: Int -> Int -> Int
778839roundDownTo elemSize size = size - (size `mod` elemSize)
779840
780−-- XXX See if resizing can be implemented by reading the old array as a stream
781−-- and then using writeN to the new array.
782−--
783841-- NOTE: we are passing elemSize explicitly to avoid an Unboxed constraint.
784842-- Since this is not inlined Unboxed consrraint leads to dictionary passing
785843-- which complicates some inspection tests.
786844--
787−{-# NOINLINE reallocExplicit #-}
788−reallocExplicit :: Int -> Int -> MutArray a -> IO (MutArray a)
789−reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
845+{-# NOINLINE reallocExplicitAs #-}
846+reallocExplicitAs :: PinnedState -> Int -> Int -> MutArray a -> IO (MutArray a)
847+reallocExplicitAs ps elemSize newCapacityInBytes MutArray{..} = do
790848 assertM(arrEnd <= arrBound)
791849
792850 -- Allocate new array
793851 let newCapMaxInBytes = roundUpLargeArray newCapacityInBytes
794852 contents <-
795− if Unboxed.isPinned arrContents
853+ if ps == Pinned
796854 then Unboxed.pinnedNew newCapMaxInBytes
797855 else Unboxed.new newCapMaxInBytes
798856 let !(MutByteArray mbarrFrom#) = arrContents
@@ -817,6 +875,10 @@ reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
817875 , arrBound = newCapInBytes
818876 }
819877
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+
820882-- | @realloc newCapacity array@ reallocates the array to the specified
821883-- capacity in bytes.
822884--
@@ -828,7 +890,12 @@ reallocExplicit elemSize newCapacityInBytes MutArray{..} = do
828890-- If the original array is pinned, the newly allocated array is also pinned.
829891{-# INLINABLE realloc #-}
830892realloc :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (MutArray a)
831−realloc bytes arr = liftIO $ reallocExplicit (SIZE_OF(a)) bytes arr
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
832899
833900-- | @reallocWith label capSizer minIncrBytes array@. The label is used
834901-- in error messages and the capSizer is used to determine the capacity of the
@@ -858,7 +925,7 @@ reallocWith label capSizer minIncrBytes arr = do
858925 , ". Please check the sizing function passed."
859926 ]
860927
861−-- | @resize newCapacity array@ changes the total capacity of the array so that
928+-- | @grow newCapacity array@ changes the total capacity of the array so that
862929-- it is enough to hold the specified number of elements. Nothing is done if
863930-- the specified capacity is less than the length of the array.
864931--
@@ -866,34 +933,46 @@ reallocWith label capSizer minIncrBytes arr = do
866933-- the block size (4K).
867934--
868935-- /Pre-release/
869−{-# INLINE resize #-}
870−resize :: forall m a. (MonadIO m, Unbox a) =>
936+{-# INLINE grow #-}
937+grow :: forall m a. (MonadIO m, Unbox a) =>
871938 Int -> MutArray a -> m (MutArray a)
872−resize nElems arr@MutArray{..} = do
939+grow nElems arr@MutArray{..} = do
873940 let req = SIZE_OF(a) * nElems
874− len = arrEnd - arrStart
875− if req < len
941+ cap = arrBound - arrStart
942+ if req < cap
876943 then return arr
877944 else realloc req arr
878945
879−-- | Like 'resize' but if the byte capacity is more than 'largeObjectThreshold'
880−-- then it is rounded up to the closest power of 2.
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.
881954--
882955-- /Pre-release/
883−{-# INLINE resizeExp #-}
884−resizeExp :: forall m a. (MonadIO m, Unbox a) =>
956+{-# INLINE growExp #-}
957+growExp :: forall m a. (MonadIO m, Unbox a) =>
885958 Int -> MutArray a -> m (MutArray a)
886−resizeExp nElems arr@MutArray{..} = do
959+growExp nElems arr@MutArray{..} = do
887960 let req = roundUpLargeArray (SIZE_OF(a) * nElems)
888961 req1 =
889962 if req > largeObjectThreshold
890963 then roundUpToPower2 req
891964 else req
892− len = arrEnd - arrStart
893− if req1 < len
965+ cap = arrBound - arrStart
966+ if req1 < cap
894967 then return arr
895968 else realloc req1 arr
896969
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+
897976-- | Resize the allocated memory to drop any reserved free space at the end of
898977-- the array and reallocate it to reduce wastage.
899978--
@@ -958,7 +1037,7 @@ snocUnsafe arr@MutArray{..} = snocNewEnd (INDEX_NEXT(arrEnd,a)) arr
9581037{-# INLINE snocMay #-}
9591038snocMay :: forall m a. (MonadIO m, Unbox a) =>
9601039 MutArray a -> a -> m (Maybe (MutArray a))
961−snocMay arr@MutArray{..} x = liftIO $ do
1040+snocMay arr@MutArray{..} x = do
9621041 let newEnd = INDEX_NEXT(arrEnd,a)
9631042 if newEnd <= arrBound
9641043 then Just <$> snocNewEnd newEnd arr x
@@ -972,7 +1051,7 @@ snocWithRealloc :: forall m a. (MonadIO m, Unbox a) =>
9721051 -> a
9731052 -> m (MutArray a)
9741053snocWithRealloc sizer arr x = do
975− arr1 <- liftIO $ reallocWith "snocWith" sizer (SIZE_OF(a)) arr
1054+ arr1 <- reallocWith "snocWith" sizer (SIZE_OF(a)) arr
9761055 snocUnsafe arr1 x
9771056
9781057-- | @snocWith sizer arr elem@ mutates @arr@ to append @elem@. The length of
@@ -994,7 +1073,7 @@ snocWith :: forall m a. (MonadIO m, Unbox a) =>
9941073 -> MutArray a
9951074 -> a
9961075 -> m (MutArray a)
997−snocWith allocSize arr x = liftIO $ do
1076+snocWith allocSize arr x = do
9981077 let newEnd = INDEX_NEXT(arrEnd arr,a)
9991078 if newEnd <= arrBound arr
10001079 then snocNewEnd newEnd arr x
@@ -1038,6 +1117,126 @@ snoc = snocWith f
10381117 then oldSize * 2
10391118 else roundUpToPower2 oldSize * 2
10401119
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+
10411240-------------------------------------------------------------------------------
10421241-- Random reads
10431242-------------------------------------------------------------------------------
@@ -1103,6 +1302,7 @@ indexReaderWith liftio (D.Stream stepi sti) = Unfold step inject
11031302 D.Stop -> return D.Stop
11041303
11051304{-# DEPRECATED getIndicesWith "Please use indexReaderWith instead." #-}
1305+{-# INLINE getIndicesWith #-}
11061306getIndicesWith :: (Monad m, Unbox a) =>
11071307 (forall b. IO b -> m b) -> D.Stream m Int -> Unfold m (MutArray a) a
11081308getIndicesWith = indexReaderWith
@@ -1114,10 +1314,11 @@ getIndicesWith = indexReaderWith
11141314-- /Pre-release/
11151315{-# INLINE indexReader #-}
11161316indexReader :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
1117−indexReader = getIndicesWith liftIO
1317+indexReader = indexReaderWith liftIO
11181318
11191319-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
11201320{-# DEPRECATED getIndices "Please use indexReader instead." #-}
1321+{-# INLINE getIndices #-}
11211322getIndices :: (MonadIO m, Unbox a) => Stream m Int -> Unfold m (MutArray a) a
11221323getIndices = indexReader
11231324
@@ -1414,7 +1615,7 @@ chunksOfAs ps n (D.Stream step state) =
14141615--
14151616-- Same as the following but may be more efficient:
14161617--
1417−-- >>> chunksOf n = Stream.foldMany (MutArray.writeN n)
1618+-- >>> chunksOf n = Stream.foldMany (MutArray.createOf n)
14181619--
14191620-- /Pre-release/
14201621{-# INLINE_NORMAL chunksOf #-}
@@ -1423,14 +1624,14 @@ chunksOf :: forall m a. (MonadIO m, Unbox a)
14231624-- XXX the idiomatic implementation leads to large regression in the D.reverse'
14241625-- benchmark. It seems it has difficulty producing optimized code when
14251626-- converting to StreamK. Investigate GHC optimizations.
1426−-- chunksOf n = D.foldMany (writeN n)
1627+-- chunksOf n = D.foldMany (createOf n)
14271628chunksOf = chunksOfAs Unpinned
14281629
14291630-- | Like 'chunksOf' but creates pinned arrays.
14301631{-# INLINE_NORMAL pinnedChunksOf #-}
14311632pinnedChunksOf :: forall m a. (MonadIO m, Unbox a)
14321633 => Int -> D.Stream m a -> D.Stream m (MutArray a)
1433−-- pinnedChunksOf n = D.foldMany (pinnedWriteN n)
1634+-- pinnedChunksOf n = D.foldMany (pinnedCreateOf n)
14341635pinnedChunksOf = chunksOfAs Pinned
14351636
14361637-- | When we are buffering a stream of unknown size into an array we do not
@@ -1463,16 +1664,10 @@ data FlattenState s contents a =
14631664 OuterLoop s
14641665 | InnerLoop s contents !Int !Int
14651666
1466−-- | Use the "reader" unfold instead.
1467−--
1468−-- @concat = unfoldMany reader@
1469−--
1470−-- We can try this if there are any fusion issues in the unfold.
1471−--
1472−{-# INLINE_NORMAL concat #-}
1473−concat :: forall m a. (MonadIO m, Unbox a)
1474− => D.Stream m (MutArray a) -> D.Stream m a
1475−concat (D.Stream step state) = D.Stream step' (OuterLoop state)
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)
14761671
14771672 where
14781673
@@ -1489,24 +1684,30 @@ concat (D.Stream step state) = D.Stream step' (OuterLoop state)
14891684 return $ D.Skip $ OuterLoop st
14901685
14911686 step' _ (InnerLoop st contents p end) = do
1492− x <- liftIO $ peekAt p contents
1687+ x <- liftio $ peekAt p contents
14931688 return $ D.Yield x (InnerLoop st contents (INDEX_NEXT(p,a)) end)
14941689
1495−{-# DEPRECATED flattenArrays "Please use \"unfoldMany reader\" instead." #-}
1496−flattenArrays :: forall m a. (MonadIO m, Unbox a)
1497− => D.Stream m (MutArray a) -> D.Stream m a
1498−flattenArrays = concat
1499−
1500−-- | Use the "readerRev" unfold instead.
1690+-- | Use the "reader" unfold instead.
15011691--
1502−-- @concat = unfoldMany readerRev@
1692+-- @concat = unfoldMany reader@
15031693--
15041694-- We can try this if there are any fusion issues in the unfold.
15051695--
1506−{-# INLINE_NORMAL concatRev #-}
1507−concatRev :: forall m a. (MonadIO m, Unbox a)
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)
15081704 => D.Stream m (MutArray a) -> D.Stream m a
1509−concatRev (D.Stream step state) = D.Stream step' (OuterLoop state)
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)
15101711
15111712 where
15121713
@@ -1524,11 +1725,23 @@ concatRev (D.Stream step state) = D.Stream step' (OuterLoop state)
15241725 return $ D.Skip $ OuterLoop st
15251726
15261727 step' _ (InnerLoop st contents p start) = do
1527− x <- liftIO $ peekAt p contents
1728+ x <- liftio $ peekAt p contents
15281729 let cur = INDEX_PREV(p,a)
15291730 return $ D.Yield x (InnerLoop st contents cur start)
15301731
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+
15311743{-# DEPRECATED flattenArraysRev "Please use \"unfoldMany readerRev\" instead." #-}
1744+{-# INLINE flattenArraysRev #-}
15321745flattenArraysRev :: forall m a. (MonadIO m, Unbox a)
15331746 => D.Stream m (MutArray a) -> D.Stream m a
15341747flattenArraysRev = concatRev
@@ -1760,7 +1973,7 @@ foldr f z arr = D.foldr f z $ read arr
17601973
17611974-- XXX Keep the bound intact to not lose any free space? Perf impact?
17621975
1763−-- | @writeAppendNUnsafe n arr@ appends up to @n@ input items to the supplied
1976+-- | @unsafeAppendN n arr@ appends up to @n@ input items to the supplied
17641977-- array.
17651978--
17661979-- Unsafe: Do not drive the fold beyond @n@ elements, it will lead to memory
@@ -1769,13 +1982,12 @@ foldr f z arr = D.foldr f z $ read arr
17691982-- Any free space left in the array after appending @n@ elements is lost.
17701983--
17711984-- /Internal/
1772−{-# INLINE_NORMAL writeAppendNUnsafe #-}
1773−writeAppendNUnsafe :: forall m a. (MonadIO m, Unbox a) =>
1985+{-# INLINE_NORMAL unsafeAppendN #-}
1986+unsafeAppendN :: forall m a. (MonadIO m, Unbox a) =>
17741987 Int
17751988 -> m (MutArray a)
17761989 -> Fold m a (MutArray a)
1777−writeAppendNUnsafe n action =
1778− fmap fromArrayUnsafe $ FL.foldlM' step initial
1990+unsafeAppendN n action = fmap fromArrayUnsafe $ FL.foldlM' step initial
17791991
17801992 where
17811993
@@ -1788,7 +2000,7 @@ writeAppendNUnsafe n action =
17882000 -- otherwise we lose that space.
17892001 arr1 <-
17902002 if free < needed
1791− then noinline reallocWith "writeAppendNUnsafeWith" (+ needed) needed arr
2003+ then noinline reallocWith "unsafeAppendN" (+ needed) needed arr
17922004 else return arr
17932005 return $ toArrayUnsafe arr1
17942006
@@ -1796,30 +2008,51 @@ writeAppendNUnsafe n action =
17962008 liftIO $ pokeAt end contents x
17972009 return $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
17982010
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+
17992019-- | Append @n@ elements to an existing array. Any free space left in the array
18002020-- after appending @n@ elements is lost.
18012021--
1802−-- >>> writeAppendN n initial = Fold.take n (MutArray.writeAppendNUnsafe n initial)
2022+-- >>> appendN n initial = Fold.take n (MutArray.unsafeAppendN n initial)
18032023--
1804−{-# INLINE_NORMAL writeAppendN #-}
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 #-}
18052032writeAppendN :: forall m a. (MonadIO m, Unbox a) =>
18062033 Int -> m (MutArray a) -> Fold m a (MutArray a)
1807−writeAppendN n initial = FL.take n (writeAppendNUnsafe n initial)
2034+writeAppendN = appendN
18082035
1809−-- | @writeAppendWith realloc action@ mutates the array generated by @action@ to
2036+-- | @appendWith realloc action@ mutates the array generated by @action@ to
18102037-- append the input stream. If there is no reserved space available in the
18112038-- array it is reallocated to a size in bytes determined by @realloc oldSize@,
18122039-- where @oldSize@ is the current size of the array in bytes.
18132040--
18142041-- Note that the returned array may be a mutated version of original array.
18152042--
1816−-- >>> writeAppendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
2043+-- >>> appendWith sizer = Fold.foldlM' (MutArray.snocWith sizer)
18172044--
18182045-- /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." #-}
18192052{-# INLINE writeAppendWith #-}
18202053writeAppendWith :: forall m a. (MonadIO m, Unbox a) =>
18212054 (Int -> Int) -> m (MutArray a) -> Fold m a (MutArray a)
1822−writeAppendWith sizer = FL.foldlM' (snocWith sizer)
2055+writeAppendWith = appendWith
18232056
18242057-- | @append action@ mutates the array generated by @action@ to append the
18252058-- input stream. If there is no reserved space available in the array it is
@@ -1827,26 +2060,33 @@ writeAppendWith sizer = FL.foldlM' (snocWith sizer)
18272060--
18282061-- Note that the returned array may be a mutated version of original array.
18292062--
1830−-- >>> writeAppend = MutArray.writeAppendWith (* 2)
2063+-- >>> append = MutArray.appendWith (* 2)
18312064--
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." #-}
18322072{-# INLINE writeAppend #-}
18332073writeAppend :: forall m a. (MonadIO m, Unbox a) =>
18342074 m (MutArray a) -> Fold m a (MutArray a)
1835−writeAppend = writeAppendWith (* 2)
2075+writeAppend = append
18362076
18372077-- XXX We can carry bound as well in the state to make sure we do not lose the
18382078-- remaining capacity. Need to check perf impact.
18392079--
1840−-- | Like 'writeNUnsafe' but takes a new array allocator @alloc size@ function
1841−-- as argument.
2080+-- | Like 'unsafeCreateOf' but takes a new array allocator @alloc size@
2081+-- function as argument.
18422082--
1843−-- >>> writeNWithUnsafe alloc n = MutArray.writeAppendNUnsafe (alloc n) n
2083+-- >>> unsafeCreateOfWith alloc n = MutArray.unsafeAppendN (alloc n) n
18442084--
18452085-- /Pre-release/
1846−{-# INLINE_NORMAL writeNWithUnsafe #-}
1847−writeNWithUnsafe :: forall m a. (MonadIO m, Unbox a)
2086+{-# INLINE_NORMAL unsafeCreateOfWith #-}
2087+unsafeCreateOfWith :: forall m a. (MonadIO m, Unbox a)
18482088 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1849−writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
2089+unsafeCreateOfWith alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
18502090
18512091 where
18522092
@@ -1857,40 +2097,64 @@ writeNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
18572097 return
18582098 $ ArrayUnsafe contents start (INDEX_NEXT(end,a))
18592099
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+
18602106{-# INLINE_NORMAL writeNUnsafeAs #-}
18612107writeNUnsafeAs :: forall m a. (MonadIO m, Unbox a)
18622108 => PinnedState -> Int -> Fold m a (MutArray a)
1863−writeNUnsafeAs ps = writeNWithUnsafe (newAs ps)
2109+writeNUnsafeAs ps = unsafeCreateOfWith (newAs ps)
18642110
1865−-- | Like 'writeN' but does not check the array bounds when writing. The fold
2111+-- | Like 'createOf' but does not check the array bounds when writing. The fold
18662112-- driver must not call the step function more than 'n' times otherwise it will
18672113-- corrupt the memory and crash. This function exists mainly because any
18682114-- conditional in the step function blocks fusion causing 10x performance
18692115-- slowdown.
18702116--
1871−-- >>> writeNUnsafe = MutArray.writeNWithUnsafe MutArray.new
2117+-- >>> unsafeCreateOf = MutArray.unsafeCreateOfWith MutArray.emptyOf
18722118--
1873−{-# INLINE_NORMAL writeNUnsafe #-}
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 #-}
18742126writeNUnsafe :: forall m a. (MonadIO m, Unbox a)
18752127 => Int -> Fold m a (MutArray a)
1876−writeNUnsafe = writeNUnsafeAs Unpinned
2128+writeNUnsafe = unsafeCreateOf
18772129
1878−-- | Like 'writeNUnsafe' but creates a pinned array.
1879−{-# INLINE_NORMAL pinnedWriteNUnsafe #-}
2130+-- | Like 'unsafeCreateOf' but creates a pinned array.
2131+{-# INLINE_NORMAL unsafePinnedCreateOf #-}
2132+unsafePinnedCreateOf :: forall m a. (MonadIO m, Unbox a)
2133+ => Int -> Fold m a (MutArray a)
2134+unsafePinnedCreateOf = writeNUnsafeAs Pinned
2135+
2136+{-# DEPRECATED pinnedWriteNUnsafe "Please use unsafePinnedCreateOf instead." #-}
2137+{-# INLINE pinnedWriteNUnsafe #-}
18802138pinnedWriteNUnsafe :: forall m a. (MonadIO m, Unbox a)
18812139 => Int -> Fold m a (MutArray a)
1882−pinnedWriteNUnsafe = writeNUnsafeAs Pinned
2140+pinnedWriteNUnsafe = unsafePinnedCreateOf
18832141
1884−-- | @writeNWith alloc n@ folds a maximum of @n@ elements into an array
2142+-- | @createOfWith alloc n@ folds a maximum of @n@ elements into an array
18852143-- allocated using the @alloc@ function.
18862144--
1887−-- >>> writeNWith alloc n = Fold.take n (MutArray.writeNWithUnsafe alloc n)
1888−-- >>> writeNWith alloc n = MutArray.writeAppendN (alloc n) n
2145+-- >>> createOfWith alloc n = Fold.take n (MutArray.unsafeCreateOfWith alloc n)
2146+-- >>> createOfWith alloc n = MutArray.appendN (alloc n) n
18892147--
1890−{-# INLINE_NORMAL writeNWith #-}
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 #-}
18912155writeNWith :: forall m a. (MonadIO m, Unbox a)
18922156 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
1893−writeNWith alloc n = FL.take n (writeNWithUnsafe alloc n)
2157+writeNWith = createOfWith
18942158
18952159{-# INLINE_NORMAL writeNAs #-}
18962160writeNAs ::
@@ -1898,28 +2162,42 @@ writeNAs ::
18982162 => PinnedState
18992163 -> Int
19002164 -> Fold m a (MutArray a)
1901−writeNAs ps = writeNWith (newAs ps)
2165+writeNAs ps = createOfWith (newAs ps)
19022166
1903−-- | @writeN n@ folds a maximum of @n@ elements from the input stream to an
2167+-- | @createOf n@ folds a maximum of @n@ elements from the input stream to an
19042168-- 'MutArray'.
19052169--
1906−-- >>> writeN = MutArray.writeNWith MutArray.new
1907−-- >>> writeN n = Fold.take n (MutArray.writeNUnsafe n)
1908−-- >>> writeN n = MutArray.writeAppendN n (MutArray.new n)
2170+-- >>> createOf = MutArray.createOfWith MutArray.new
2171+-- >>> createOf n = Fold.take n (MutArray.unsafeCreateOf n)
2172+-- >>> createOf n = MutArray.appendN n (MutArray.emptyOf n)
19092173--
1910−{-# INLINE_NORMAL writeN #-}
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 #-}
19112181writeN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1912−writeN = writeNAs Unpinned
2182+writeN = createOf
19132183
1914−-- | Like 'writeN' but creates a pinned array.
1915−{-# INLINE_NORMAL pinnedWriteN #-}
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 #-}
19162194pinnedWriteN ::
19172195 forall m a. (MonadIO m, Unbox a)
19182196 => Int
19192197 -> Fold m a (MutArray a)
1920−pinnedWriteN = writeNAs Pinned
2198+pinnedWriteN = pinnedCreateOf
19212199
1922−-- | Like writeNWithUnsafe but writes the array in reverse order.
2200+-- | Like unsafeCreateOfWith but writes the array in reverse order.
19232201--
19242202-- /Internal/
19252203{-# INLINE_NORMAL writeRevNWithUnsafe #-}
@@ -1940,7 +2218,7 @@ writeRevNWithUnsafe alloc n = fromArrayUnsafe <$> FL.foldlM' step initial
19402218 return
19412219 $ ArrayUnsafe contents ptr end
19422220
1943−-- | Like writeNWith but writes the array in reverse order.
2221+-- | Like createOfWith but writes the array in reverse order.
19442222--
19452223-- /Internal/
19462224{-# INLINE_NORMAL writeRevNWith #-}
@@ -1948,31 +2226,36 @@ writeRevNWith :: forall m a. (MonadIO m, Unbox a)
19482226 => (Int -> m (MutArray a)) -> Int -> Fold m a (MutArray a)
19492227writeRevNWith alloc n = FL.take n (writeRevNWithUnsafe alloc n)
19502228
1951−-- | Like writeN but writes the array in reverse order.
2229+-- | Like 'createOf' but writes the array in reverse order.
19522230--
19532231-- /Pre-release/
1954−{-# INLINE_NORMAL writeRevN #-}
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 #-}
19552238writeRevN :: forall m a. (MonadIO m, Unbox a) => Int -> Fold m a (MutArray a)
1956−writeRevN = writeRevNWith new
2239+writeRevN = revCreateOf
19572240
19582241-- | @pinnedWriteNAligned align n@ folds a maximum of @n@ elements from the
19592242-- input stream to a 'MutArray' aligned to the given size.
19602243--
1961−-- >>> pinnedWriteNAligned align = MutArray.writeNWith (MutArray.pinnedNewAligned align)
1962−-- >>> pinnedWriteNAligned align n = MutArray.writeAppendN n (MutArray.pinnedNewAligned align n)
2244+-- >>> pinnedWriteNAligned align = MutArray.createOfWith (MutArray.pinnedNewAligned align)
2245+-- >>> pinnedWriteNAligned align n = MutArray.appendN n (MutArray.pinnedNewAligned align n)
19632246--
19642247-- /Pre-release/
19652248--
19662249{-# INLINE_NORMAL pinnedWriteNAligned #-}
19672250pinnedWriteNAligned :: forall m a. (MonadIO m, Unbox a)
19682251 => Int -> Int -> Fold m a (MutArray a)
1969−pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
2252+pinnedWriteNAligned align = createOfWith (pinnedNewAligned align)
19702253
19712254-- XXX Buffer to a list instead?
19722255
19732256-- | Buffer a stream into a stream of arrays.
19742257--
1975−-- >>> buildChunks n = Fold.many (MutArray.writeN n) Fold.toStreamK
2258+-- >>> buildChunks n = Fold.many (MutArray.createOf n) Fold.toStreamK
19762259--
19772260-- Breaking an array into an array stream can be useful to consume a large
19782261-- array sequentially such that memory of the array is released incrementatlly.
@@ -1984,9 +2267,10 @@ pinnedWriteNAligned align = writeNWith (pinnedNewAligned align)
19842267{-# INLINE_NORMAL buildChunks #-}
19852268buildChunks :: (MonadIO m, Unbox a) =>
19862269 Int -> Fold m a (StreamK n (MutArray a))
1987−buildChunks n = FL.many (writeN n) FL.toStreamK
2270+buildChunks n = FL.many (createOf n) FL.toStreamK
19882271
19892272{-# DEPRECATED writeChunks "Please use buildChunks instead." #-}
2273+{-# INLINE writeChunks #-}
19902274writeChunks :: (MonadIO m, Unbox a) =>
19912275 Int -> Fold m a (StreamK n (MutArray a))
19922276writeChunks = buildChunks
@@ -1994,29 +2278,29 @@ writeChunks = buildChunks
19942278{-# INLINE_NORMAL writeWithAs #-}
19952279writeWithAs :: forall m a. (MonadIO m, Unbox a)
19962280 => PinnedState -> Int -> Fold m a (MutArray a)
1997−-- writeWithAs ps n = FL.rmapM rightSize $ writeAppendWith (* 2) (newAs ps n)
2281+-- writeWithAs ps n = FL.rmapM rightSize $ appendWith (* 2) (newAs ps n)
19982282writeWithAs ps elemCount =
19992283 FL.rmapM extract $ FL.foldlM' step initial
20002284
20012285 where
20022286
20032287 initial = do
2004− when (elemCount < 0) $ error "writeWith: elemCount is negative"
2005− liftIO $ newAs ps elemCount
2288+ when (elemCount < 0) $ error "createWith: elemCount is negative"
2289+ newAs ps elemCount
20062290
20072291 step arr@(MutArray _ start end bound) x
20082292 | INDEX_NEXT(end,a) > bound = do
20092293 let oldSize = end - start
20102294 newSize = max (oldSize * 2) 1
2011− arr1 <- liftIO $ reallocExplicit (SIZE_OF(a)) newSize arr
2295+ arr1 <- liftIO $ reallocExplicitAs ps (SIZE_OF(a)) newSize arr
20122296 snocUnsafe arr1 x
20132297 step arr x = snocUnsafe arr x
20142298
20152299 extract = liftIO . rightSize
20162300
2017−-- XXX Compare writeWith with fromStreamD which uses an array of streams
2301+-- XXX Compare createWith with fromStreamD which uses an array of streams
20182302-- implementation. We can write this using buildChunks above if that is faster.
2019−-- If writeWith is faster then we should use that to implement
2303+-- If createWith is faster then we should use that to implement
20202304-- fromStreamD.
20212305--
20222306-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -2031,39 +2315,56 @@ writeWithAs ps elemCount =
20312315-- XXX check if GHC's memory allocator is efficient enough. We can try the C
20322316-- malloc to compare against.
20332317
2034−-- | @writeWith minCount@ folds the whole input to a single array. The array
2318+-- | @createWith minCount@ folds the whole input to a single array. The array
20352319-- starts at a size big enough to hold minCount elements, the size is doubled
20362320-- every time the array needs to be grown.
20372321--
20382322-- /Caution! Do not use this on infinite streams./
20392323--
2040−-- >>> f n = MutArray.writeAppendWith (* 2) (MutArray.new n)
2041−-- >>> writeWith n = Fold.rmapM MutArray.rightSize (f n)
2042−-- >>> writeWith n = Fold.rmapM MutArray.fromChunksK (MutArray.buildChunks n)
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)
20432327--
20442328-- /Pre-release/
2045−{-# INLINE_NORMAL writeWith #-}
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 #-}
20462337writeWith :: forall m a. (MonadIO m, Unbox a)
20472338 => Int -> Fold m a (MutArray a)
2048−-- writeWith n = FL.rmapM rightSize $ writeAppendWith (* 2) (new n)
2049−writeWith = writeWithAs Unpinned
2339+writeWith = createWith
20502340
20512341-- | Fold the whole input to a single array.
20522342--
2053−-- Same as 'writeWith' using an initial array size of 'arrayChunkBytes' bytes
2343+-- Same as 'createWith' using an initial array size of 'arrayChunkBytes' bytes
20542344-- rounded up to the element size.
20552345--
20562346-- /Caution! Do not use this on infinite streams./
20572347--
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." #-}
20582354{-# INLINE write #-}
20592355write :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2060−write = writeWith (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
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)
20612363
2062−-- | Like 'write' but creates a pinned array.
2364+{-# DEPRECATED pinnedWrite "Please use pinnedCreate instead." #-}
20632365{-# INLINE pinnedWrite #-}
20642366pinnedWrite :: forall m a. (MonadIO m, Unbox a) => Fold m a (MutArray a)
2065−pinnedWrite =
2066− writeWithAs Pinned (allocBytesToElemCount (undefined :: a) arrayChunkBytes)
2367+pinnedWrite = pinnedCreate
20672368
20682369-------------------------------------------------------------------------------
20692370-- construct from streams, known size
@@ -2073,7 +2374,7 @@ pinnedWrite =
20732374fromStreamDNAs :: forall m a. (MonadIO m, Unbox a)
20742375 => PinnedState -> Int -> D.Stream m a -> m (MutArray a)
20752376fromStreamDNAs ps limit str = do
2076− (arr :: MutArray a) <- liftIO $ newAs ps limit
2377+ (arr :: MutArray a) <- newAs ps limit
20772378 end <- D.foldlM' (fwrite (arrContents arr)) (return $ arrEnd arr) $ D.take limit str
20782379 return $ arr {arrEnd = end}
20792380
@@ -2083,17 +2384,18 @@ fromStreamDNAs ps limit str = do
20832384 liftIO $ pokeAt ptr arrContents x
20842385 return $ INDEX_NEXT(ptr,a)
20852386
2086−-- | Use the 'writeN' fold instead.
2387+-- | Use the 'createOf' fold instead.
20872388--
2088−-- >>> fromStreamN n = Stream.fold (MutArray.writeN n)
2389+-- >>> fromStreamN n = Stream.fold (MutArray.createOf n)
20892390--
20902391{-# INLINE_NORMAL fromStreamN #-}
20912392fromStreamN :: forall m a. (MonadIO m, Unbox a)
20922393 => Int -> D.Stream m a -> m (MutArray a)
2093−-- fromStreamDN n = D.fold (writeN n)
2394+-- fromStreamDN n = D.fold (createOf n)
20942395fromStreamN = fromStreamDNAs Unpinned
20952396
20962397{-# DEPRECATED fromStreamDN "Please use fromStreamN instead." #-}
2398+{-# INLINE fromStreamDN #-}
20972399fromStreamDN :: forall m a. (MonadIO m, Unbox a)
20982400 => Int -> D.Stream m a -> m (MutArray a)
20992401fromStreamDN = fromStreamN
@@ -2116,20 +2418,20 @@ pinnedFromListN n xs = fromStreamDNAs Pinned n $ D.fromList xs
21162418-- /Pre-release/
21172419{-# INLINE fromListRevN #-}
21182420fromListRevN :: (MonadIO m, Unbox a) => Int -> [a] -> m (MutArray a)
2119−fromListRevN n xs = D.fold (writeRevN n) $ D.fromList xs
2421+fromListRevN n xs = D.fold (revCreateOf n) $ D.fromList xs
21202422
21212423-- | Convert a pure stream in Identity monad to a mutable array.
21222424{-# INLINABLE fromPureStreamN #-}
21232425fromPureStreamN :: (MonadIO m, Unbox a) =>
21242426 Int -> Stream Identity a -> m (MutArray a)
21252427fromPureStreamN n xs =
2126− liftIO $ D.fold (writeN n) $ D.morphInner (return . runIdentity) xs
2428+ D.fold (createOf n) $ D.morphInner (return . runIdentity) xs
21272429
21282430-- | Convert a pure stream in Identity monad to a mutable array.
21292431{-# INLINABLE fromPureStream #-}
21302432fromPureStream :: (MonadIO m, Unbox a) => Stream Identity a -> m (MutArray a)
21312433fromPureStream xs =
2132− liftIO $ D.fold write $ D.morphInner (return . runIdentity) xs
2434+ D.fold create $ D.morphInner (return . runIdentity) xs
21332435
21342436{-# INLINABLE fromPtrN #-}
21352437fromPtrN :: MonadIO m => Int -> Ptr Word8 -> m (MutArray Word8)
@@ -2138,7 +2440,7 @@ fromPtrN len addr = do
21382440 -- XXX We can implement a stream copy in a similar way by streaming Word64
21392441 -- first and then remaining Word8.
21402442 arr <- new len
2141− _ <- asUnpinnedPtrUnsafe arr
2443+ _ <- unsafeAsPtr arr
21422444 (\ptr -> liftIO $ c_memcpy ptr addr (fromIntegral len))
21432445 return (arr {arrEnd = len})
21442446
@@ -2154,7 +2456,7 @@ fromByteStr# addr = do
21542456 len <- liftIO $ c_strlen (Ptr addr)
21552457 let lenInt = fromIntegral len
21562458 arr <- new lenInt
2157− _ <- asUnpinnedPtrUnsafe arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
2459+ _ <- unsafeAsPtr arr (\ptr -> liftIO $ c_memcpy ptr (Ptr addr) len)
21582460 return (arr {arrEnd = lenInt})
21592461
21602462-------------------------------------------------------------------------------
@@ -2175,7 +2477,7 @@ fromChunksRealloced s = do
21752477 arr <- D.foldlM' spliceExp (pure a) strm
21762478 -- Reallocation is exponential so there may be 50% empty space in
21772479 -- worst case. One more reallocation to reclaim the space.
2178− liftIO $ rightSize arr
2480+ rightSize arr
21792481 Nothing -> pure nil
21802482
21812483-------------------------------------------------------------------------------
@@ -2213,6 +2515,7 @@ fromChunksK :: (Unbox a, MonadIO m) =>
22132515fromChunksK = fromChunkskAs Unpinned
22142516
22152517{-# DEPRECATED fromArrayStreamK "Please use fromChunksK instead." #-}
2518+{-# INLINE fromArrayStreamK #-}
22162519fromArrayStreamK :: (Unbox a, MonadIO m) =>
22172520 StreamK m (MutArray a) -> m (MutArray a)
22182521fromArrayStreamK = fromChunksK
@@ -2224,7 +2527,7 @@ fromStreamDAs ps m =
22242527 arrayStreamKFromStreamDAs Unpinned m >>= fromChunkskAs ps
22252528
22262529-- | Create an 'Array' from a stream. This is useful when we want to create a
2227−-- single array from a stream of unknown size. 'writeN' is at least twice
2530+-- single array from a stream of unknown size. 'createOf' is at least twice
22282531-- as efficient when the size is already known.
22292532--
22302533-- Note that if the input stream is too large memory allocation for the array
@@ -2236,19 +2539,19 @@ fromStreamDAs ps m =
22362539fromStream :: (MonadIO m, Unbox a) => Stream m a -> m (MutArray a)
22372540fromStream = fromStreamDAs Unpinned
22382541
2239−-- fromStream (Stream m) = P.fold write m
2542+-- fromStream (Stream m) = P.fold create m
22402543-- CAUTION: a very large number (millions) of arrays can degrade performance
22412544-- due to GC overhead because we need to buffer the arrays before we flatten
22422545-- all the arrays.
22432546--
2244−-- XXX Compare if this is faster or "fold write".
2547+-- XXX Compare if this is faster or "fold create".
22452548--
22462549-- | We could take the approach of doubling the memory allocation on each
22472550-- overflow. This would result in more or less the same amount of copying as in
22482551-- the chunking approach. However, if we have to shrink in the end then it may
22492552-- result in an extra copy of the entire data.
22502553--
2251−-- >>> fromStreamD = StreamD.fold MutArray.write
2554+-- >>> fromStreamD = StreamD.fold MutArray.create
22522555--
22532556{-# INLINE fromStreamD #-}
22542557{-# DEPRECATED fromStreamD "Please use fromStream instead." #-}
@@ -2278,6 +2581,10 @@ fromListRev xs = fromListRevN (Prelude.length xs) xs
22782581-- Cloning
22792582-------------------------------------------------------------------------------
22802583
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+
22812588{-# INLINE cloneAs #-}
22822589cloneAs ::
22832590 ( MonadIO m
@@ -2287,7 +2594,7 @@ cloneAs ::
22872594 )
22882595 => PinnedState -> MutArray a -> m (MutArray a)
22892596cloneAs ps src =
2290− liftIO $ do
2597+ do
22912598 let startSrc = arrStart src
22922599 srcLen = arrEnd src - startSrc
22932600 newArrContents <-
@@ -2326,17 +2633,16 @@ spliceCopy :: forall m a. MonadIO m =>
23262633 Unbox a =>
23272634#endif
23282635 MutArray a -> MutArray a -> m (MutArray a)
2329−spliceCopy arr1 arr2 = liftIO $ do
2636+spliceCopy arr1 arr2 = do
23302637 let start1 = arrStart arr1
23312638 start2 = arrStart arr2
23322639 len1 = arrEnd arr1 - start1
23332640 len2 = arrEnd arr2 - start2
2334− let newLen = len1 + len2
2641+ let len = len1 + len2
23352642 newArrContents <-
23362643 if Unboxed.isPinned (arrContents arr1)
2337− then Unboxed.pinnedNew newLen
2338− else Unboxed.new newLen
2339− let len = len1 + len2
2644+ then liftIO $ Unboxed.pinnedNew len
2645+ else liftIO $ Unboxed.new len
23402646 putSliceUnsafe (arrContents arr1) start1 newArrContents 0 len1
23412647 putSliceUnsafe (arrContents arr2) start2 newArrContents len1 len2
23422648 return $ MutArray newArrContents 0 len len
@@ -2348,7 +2654,7 @@ spliceCopy arr1 arr2 = liftIO $ do
23482654spliceUnsafe :: MonadIO m =>
23492655 MutArray a -> MutArray a -> m (MutArray a)
23502656spliceUnsafe dst src =
2351− liftIO $ do
2657+ do
23522658 let startSrc = arrStart src
23532659 srcLen = arrEnd src - startSrc
23542660 endDst = arrEnd dst
@@ -2370,7 +2676,7 @@ spliceWith :: forall m a. (MonadIO m, Unbox a) =>
23702676 (Int -> Int -> Int) -> MutArray a -> MutArray a -> m (MutArray a)
23712677spliceWith sizer dst@(MutArray _ start end bound) src = do
23722678{-
2373− let f = writeAppendWith (`sizer` byteLength src) (return dst)
2679+ let f = appendWith (`sizer` byteLength src) (return dst)
23742680 in D.fold f (toStreamD src)
23752681-}
23762682 assert (end <= bound) (return ())
@@ -2386,7 +2692,7 @@ spliceWith sizer dst@(MutArray _ start end bound) src = do
23862692 $ "splice: newSize is less than the total size "
23872693 ++ "of arrays being appended. Please check the "
23882694 ++ "sizer function passed."
2389− liftIO $ realloc newSizeInBytes dst
2695+ realloc newSizeInBytes dst
23902696 else return dst
23912697 spliceUnsafe dst1 src
23922698
@@ -2438,7 +2744,7 @@ splitOn predicate arr =
24382744{-# INLINE breakOn #-}
24392745breakOn :: MonadIO m
24402746 => Word8 -> MutArray Word8 -> m (MutArray Word8, Maybe (MutArray Word8))
2441−breakOn sep arr@MutArray{..} = asUnpinnedPtrUnsafe arr $ \p -> liftIO $ do
2747+breakOn sep arr@MutArray{..} = unsafeAsPtr arr $ \p -> liftIO $ do
24422748 -- XXX We do not need memchr here, we can use a Haskell equivalent.
24432749 -- Need efficient stream based primitives that work on Word64.
24442750 loc <- c_memchr p sep (fromIntegral $ byteLength arr)
@@ -2461,33 +2767,41 @@ breakOn sep arr@MutArray{..} = asUnpinnedPtrUnsafe arr $ \p -> liftIO $ do
24612767 }
24622768 )
24632769
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+
24642792-- | Create two slices of an array without copying the original array. The
24652793-- specified index @i@ is the first index of the second slice.
24662794--
24672795{-# INLINE splitAt #-}
24682796splitAt :: forall a. Unbox a => Int -> MutArray a -> (MutArray a, MutArray a)
2469−splitAt i arr@MutArray{..} =
2797+splitAt i arr =
24702798 let maxIndex = length arr - 1
24712799 in if i < 0
24722800 then error "sliceAt: negative array index"
24732801 else if i > maxIndex
24742802 then error $ "sliceAt: specified array index " ++ show i
24752803 ++ " is beyond the maximum index " ++ show maxIndex
2476− else let off = i * SIZE_OF(a)
2477− p = arrStart + off
2478− in ( MutArray
2479− { arrContents = arrContents
2480− , arrStart = arrStart
2481− , arrEnd = p
2482− , arrBound = p
2483− }
2484− , MutArray
2485− { arrContents = arrContents
2486− , arrStart = p
2487− , arrEnd = arrEnd
2488− , arrBound = arrBound
2489− }
2490− )
2804+ else unsafeSplitAt i arr
24912805
24922806-------------------------------------------------------------------------------
24932807-- Casting
@@ -2537,9 +2851,13 @@ cast arr =
25372851-- guarantees that unsafe calls will be performed in the calling thread. Making
25382852-- it safe to pass heap-allocated objects to unsafe functions.
25392853
2540−-- Should we just name it asPtr, the unsafety is implicit for any pointer
2854+-- XXX Should we just name it asPtr, the unsafety is implicit for any pointer
25412855-- operations. And we are safe from Haskell perspective because we will be
25422856-- 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.
25432861
25442862-- | Use a @MutArray a@ as @Ptr a@. This is useful when we want to pass an
25452863-- array as a pointer to some operating system call or to a "safe" FFI call.
@@ -2557,16 +2875,21 @@ cast arr =
25572875--
25582876-- /Pre-release/
25592877--
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." #-}
25602885{-# INLINE asPtrUnsafe #-}
25612886asPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2562−asPtrUnsafe arr f =
2563− Unboxed.asPtrUnsafe
2564− (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
2887+asPtrUnsafe = unsafePinnedAsPtr
25652888
2566−{-# INLINE asUnpinnedPtrUnsafe #-}
2567−asUnpinnedPtrUnsafe :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2568−asUnpinnedPtrUnsafe arr f =
2569− Unboxed.asUnpinnedPtrUnsafe
2889+{-# INLINE unsafeAsPtr #-}
2890+unsafeAsPtr :: MonadIO m => MutArray a -> (Ptr a -> m b) -> m b
2891+unsafeAsPtr arr f =
2892+ Unboxed.unsafeAsPtr
25702893 (arrContents arr) (\ptr -> f (ptr `plusPtr` arrStart arr))
25712894
25722895-------------------------------------------------------------------------------
@@ -2584,28 +2907,26 @@ asUnpinnedPtrUnsafe arr f =
25842907-- /Pre-release/
25852908{-# INLINE byteCmp #-}
25862909byteCmp :: MonadIO m => MutArray a -> MutArray a -> m Ordering
2587−byteCmp arr1 arr2 =
2588− liftIO
2589− $ do
2590− let marr1 = getMutableByteArray# (arrContents arr1)
2591− marr2 = getMutableByteArray# (arrContents arr2)
2592− !(I# st1#) = arrStart arr1
2593− !(I# st2#) = arrStart arr2
2594− !(I# len#) = byteLength arr1
2595− case compare (byteLength arr1) (byteLength arr2) of
2596− EQ -> do
2597− r <- liftIO $ IO $ \s# ->
2598− let res =
2599− I#
2600− (compareByteArrays#
2601− (unsafeCoerce# marr1)
2602− st1#
2603− (unsafeCoerce# marr2)
2604− st2#
2605− len#)
2606− in (# s#, res #)
2607− return $ compare r 0
2608− x -> return x
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
26092930
26102931{-# INLINE cmp #-}
26112932{-# DEPRECATED cmp "Please use byteCmp instead." #-}
@@ -2625,46 +2946,48 @@ byteEq arr1 arr2 = fmap (EQ ==) $ byteCmp arr1 arr2
26252946-- Compact
26262947-------------------------------------------------------------------------------
26272948
2628−-- | Parser @pCompactLE n@ coalesces adjacent arrays in the input stream
2629−-- only if the combined size would be less than or equal to n.
2630−--
2631−-- /Internal/
2632−{-# INLINE_NORMAL pCompactLE #-}
2633−pCompactLE ::
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 ::
26342956 forall m a. (MonadIO m, Unbox a)
2635− => Int -> Parser (MutArray a) m (MutArray a)
2636−pCompactLE n = Parser step initial extract
2957+ => PinnedState -> Int -> Parser (MutArray a) m (MutArray a)
2958+pCompactLeAs ps maxElems = Parser step initial extract
26372959
26382960 where
26392961
2640− nBytes = n * SIZE_OF(a)
2962+ maxBytes = maxElems * SIZE_OF(a)
26412963
26422964 functionName = "Streamly.Internal.Data.MutArray.pCompactLE"
26432965
26442966 initial =
26452967 return
2646− $ if n <= 0
2968+ $ if maxElems <= 0
26472969 then error
26482970 $ functionName
26492971 ++ ": the size of arrays ["
2650− ++ show n ++ "] must be a natural number"
2972+ ++ show maxElems ++ "] must be a natural number"
26512973 else Parser.IPartial Nothing
26522974
26532975 step Nothing arr =
26542976 return
26552977 $ let len = byteLength arr
2656− in if len >= nBytes
2978+ in if len >= maxBytes
26572979 then Parser.Done 0 arr
26582980 else Parser.Partial 0 (Just arr)
2981+ -- XXX Split the last array to use the space more compactly.
26592982 step (Just buf) arr =
26602983 let len = byteLength buf + byteLength arr
2661− in if len > nBytes
2984+ in if len > maxBytes
26622985 then return $ Parser.Done 1 buf
26632986 else do
2664− -- XXX check this in the Nothing case
26652987 buf1 <-
2666− if byteCapacity buf < nBytes
2667− then liftIO $ realloc nBytes buf
2988+ if byteCapacity buf < maxBytes
2989+ then liftIO $ reallocExplicitAs
2990+ ps (SIZE_OF(a)) maxBytes buf
26682991 else return buf
26692992 buf2 <- spliceUnsafe buf1 arr
26702993 return $ Parser.Partial 0 (Just buf2)
@@ -2672,6 +2995,30 @@ pCompactLE n = Parser step initial extract
26722995 extract Nothing = return $ Parser.Done 0 nil
26732996 extract (Just buf) = return $ Parser.Done 0 buf
26742997
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+
26753022data SpliceState s arr
26763023 = SpliceInitial s
26773024 | SpliceBuffering s arr
@@ -2683,48 +3030,47 @@ data SpliceState s arr
26833030-- immutable array never has additional space so a new array is allocated
26843031-- instead of mutating it.
26853032
2686−-- | Scan @rCompactLE n@ coalesces adjacent arrays in the input stream
2687−-- only if the combined size would be less than or equal to n.
2688−--
2689−-- /Internal/
2690−{-# INLINE_NORMAL rCompactLE #-}
2691−rCompactLE :: (MonadIO m, Unbox a)
2692− => Int -> D.Stream m (MutArray a) -> D.Stream m (MutArray a)
2693−rCompactLE n (D.Stream step state) =
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) =
26943037 D.Stream step' (SpliceInitial state)
26953038
26963039 where
26973040
3041+ maxBytes = maxElems * SIZE_OF(a)
3042+
26983043 functionName = "Streamly.Internal.Data.MutArray.rCompactLE"
26993044
27003045 {-# INLINE_LATE step' #-}
27013046 step' gst (SpliceInitial st) = do
2702− when (n <= 0) $
3047+ when (maxElems <= 0) $
27033048 -- XXX we can pass the module string from the higher level API
2704− error $ functionName ++ ": the size of arrays [" ++ show n
3049+ error $ functionName ++ ": the size of arrays [" ++ show maxElems
27053050 ++ "] must be a natural number"
27063051 r <- step gst st
27073052 case r of
27083053 D.Yield arr s -> return $
27093054 let len = byteLength arr
2710− in if len >= n
3055+ in if len >= maxBytes
27113056 then D.Skip (SpliceYielding arr (SpliceInitial s))
27123057 else D.Skip (SpliceBuffering s arr)
27133058 D.Skip s -> return $ D.Skip (SpliceInitial s)
27143059 D.Stop -> return D.Stop
27153060
3061+ -- XXX Split the last array to use the space more compactly.
27163062 step' gst (SpliceBuffering st buf) = do
27173063 r <- step gst st
27183064 case r of
27193065 D.Yield arr s -> do
27203066 let len = byteLength buf + byteLength arr
2721− if len > n
3067+ if len > maxBytes
27223068 then return $
27233069 D.Skip (SpliceYielding buf (SpliceBuffering s arr))
27243070 else do
2725− -- XXX check this in the SpliceInitial case
2726− buf1 <- if byteCapacity buf < n
2727− then liftIO $ realloc n buf
3071+ buf1 <- if byteCapacity buf < maxBytes
3072+ then liftIO $ reallocExplicitAs
3073+ ps (SIZE_OF(a)) maxBytes buf
27283074 else return buf
27293075 buf2 <- spliceUnsafe buf1 arr
27303076 return $ D.Skip (SpliceBuffering s buf2)
@@ -2735,108 +3081,119 @@ rCompactLE n (D.Stream step state) =
27353081
27363082 step' _ (SpliceYielding arr next) = return $ D.Yield arr next
27373083
2738−-- | Fold @fCompactGE n@ coalesces adjacent arrays in the input stream
2739−-- until the size becomes greater than or equal to n.
2740−--
2741−{-# INLINE_NORMAL fCompactGE #-}
2742−fCompactGE ::
3084+
3085+{-# INLINE_NORMAL fCompactGeAs #-}
3086+fCompactGeAs ::
27433087 forall m a. (MonadIO m, Unbox a)
2744− => Int -> FL.Fold m (MutArray a) (MutArray a)
2745−fCompactGE n = Fold step initial extract extract
3088+ => PinnedState -> Int -> FL.Fold m (MutArray a) (MutArray a)
3089+fCompactGeAs ps minElems = Fold step initial extract extract
27463090
27473091 where
27483092
2749− nBytes = n * SIZE_OF(a)
3093+ minBytes = minElems * SIZE_OF(a)
27503094
27513095 functionName = "Streamly.Internal.Data.MutArray.fCompactGE"
27523096
27533097 initial =
27543098 return
2755− $ if n < 0
3099+ $ if minElems < 0
27563100 then error
27573101 $ functionName
27583102 ++ ": the size of arrays ["
2759− ++ show n ++ "] must be a natural number"
3103+ ++ show minElems ++ "] must be a natural number"
27603104 else FL.Partial Nothing
27613105
27623106 step Nothing arr =
27633107 return
27643108 $ let len = byteLength arr
2765− in if len >= nBytes
3109+ in if len >= minBytes
27663110 then FL.Done arr
27673111 else FL.Partial (Just arr)
3112+ -- XXX Buffer arrays as a list to avoid copy and reallocations
27683113 step (Just buf) arr = do
27693114 let len = byteLength buf + byteLength arr
27703115 buf1 <-
27713116 if byteCapacity buf < len
2772− then liftIO $ realloc (max len nBytes) buf
3117+ then liftIO $ reallocExplicitAs
3118+ ps (SIZE_OF(a)) (max minBytes len) buf
27733119 else return buf
27743120 buf2 <- spliceUnsafe buf1 arr
2775− if len >= n
3121+ if len >= minBytes
27763122 then return $ FL.Done buf2
27773123 else return $ FL.Partial (Just buf2)
27783124
27793125 extract Nothing = return nil
27803126 extract (Just buf) = return buf
27813127
2782−-- | Like 'compactGE' but for transforming folds instead of stream.
2783−--
2784−-- >>> lCompactGE n = Fold.many (MutArray.fCompactGE n)
3128+-- | Fold @fCompactGE minElems@ coalesces adjacent arrays in the input stream
3129+-- until the size becomes greater than or equal to @minElems@.
27853130--
2786−{-# INLINE_NORMAL lCompactGE #-}
2787−lCompactGE :: (MonadIO m, Unbox a)
2788− => Int -> Fold m (MutArray a) () -> Fold m (MutArray a) ()
2789−-- lCompactGE n = Fold.many (fCompactGE n)
2790−lCompactGE n (Fold step1 initial1 _ final1) =
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) =
27913152 Fold step initial extract final
27923153
27933154 where
27943155
3156+ minBytes = minElems * SIZE_OF(a)
3157+
27953158 functionName = "Streamly.Internal.Data.MutArray.lCompactGE"
27963159
27973160 initial = do
2798− when (n <= 0) $
3161+ when (minElems <= 0) $
27993162 -- XXX we can pass the module string from the higher level API
28003163 error $ functionName ++ ": the size of arrays ["
2801− ++ show n ++ "] must be a natural number"
3164+ ++ show minElems ++ "] must be a natural number"
28023165
28033166 r <- initial1
28043167 return $ first (Tuple' Nothing) r
28053168
2806− step (Tuple' Nothing r1) arr =
2807− let len = byteLength arr
2808− in if len >= n
2809− then do
2810− r <- step1 r1 arr
2811− case r of
2812− FL.Done _ -> return $ FL.Done ()
2813− FL.Partial s -> do
2814− _ <- final1 s
2815− res <- initial1
2816− return $ first (Tuple' Nothing) res
2817− else return $ FL.Partial $ Tuple' (Just arr) r1
2818−
2819− step (Tuple' (Just buf) r1) arr = do
2820− let len = byteLength buf + byteLength arr
2821− buf1 <- if byteCapacity buf < len
2822− then liftIO $ realloc (max n len) buf
2823− else return buf
2824− buf2 <- spliceUnsafe buf1 arr
2825−
2826− -- XXX this is common in both the equations of step
2827− if len >= n
3169+ {-# INLINE runInner #-}
3170+ runInner len acc buf =
3171+ if len >= minBytes
28283172 then do
2829− r <- step1 r1 buf2
3173+ r <- step1 acc buf
28303174 case r of
28313175 FL.Done _ -> return $ FL.Done ()
28323176 FL.Partial s -> do
28333177 _ <- final1 s
28343178 res <- initial1
28353179 return $ first (Tuple' Nothing) res
2836− else return $ FL.Partial $ Tuple' (Just buf2) r1
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
28373194
28383195 -- XXX Several folds do extract >=> final, therefore, we need to make final
2839− -- return "m b" rather than using extract post it if we want extract to be
3196+ -- return "m b" rather than using extract post it if we want extract to be
28403197 -- partial.
28413198 --
28423199 -- extract forces the pending buffer to be sent to the fold which is not
@@ -2850,6 +3207,23 @@ lCompactGE n (Fold step1 initial1 _ final1) =
28503207 FL.Partial rr -> final1 rr
28513208 FL.Done _ -> return ()
28523209
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+
28533227-- | @compactGE n stream@ coalesces adjacent arrays in the @stream@ until
28543228-- the size becomes greater than or equal to @n@.
28553229--