haskell/zip-stream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix space leak

Browse Source 
There was a space leak when copmuting the CRC for the file. This
basically retained file data so streaming did not happen in constant
memory anymore.
This commit is contained in:
raichoo 2018-10-18 15:33:53 +02:00
parent 5e9390b430
commit e0f51b0c90
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Codec/Archive/Zip/Conduit/Internal.hs
View File

@ -1,4 +1,5 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# LANGUAGE BangPatterns #-}
module Codec.Archive.Zip.Conduit.Internal module Codec.Archive.Zip.Conduit.Internal
( osVersion, zipVersion ( osVersion, zipVersion
, zipError , zipError
@ -42,14 +43,14 @@ idConduit :: Monad m => C.ConduitM a a m ()
idConduit = C.awaitForever C.yield idConduit = C.awaitForever C.yield
passthroughFold :: Monad m => (a -> b -> a) -> a -> C.ConduitM b b m a passthroughFold :: Monad m => (a -> b -> a) -> a -> C.ConduitM b b m a
passthroughFold f z = C.await >>= maybe passthroughFold f !z = C.await >>= maybe
(return z) (return z)
(\x -> do (\x -> do
C.yield x C.yield x
passthroughFold f (f z x)) passthroughFold f (f z x))
sizeCRC :: Monad m => C.ConduitM BS.ByteString BS.ByteString m (Word64, Word32) sizeCRC :: Monad m => C.ConduitM BS.ByteString BS.ByteString m (Word64, Word32)
sizeCRC = passthroughFold (\(l, c) b -> (l + fromIntegral (BS.length b), crc32Update c b)) (0, 0) sizeCRC = passthroughFold (\(!l, !c) b -> (l + fromIntegral (BS.length b), crc32Update c b)) (0, 0)
sizeC :: Monad m => C.ConduitM BS.ByteString BS.ByteString m Word64 sizeC :: Monad m => C.ConduitM BS.ByteString BS.ByteString m Word64
sizeC = passthroughFold (\l b -> l + fromIntegral (BS.length b)) 0 -- fst <$> sizeCRC sizeC = passthroughFold (\l b -> l + fromIntegral (BS.length b)) 0 -- fst <$> sizeCRC