dc7aad1 · streamly · git.iko.soy

git.iko.soy/streamly

Streamly: Memory: Cleanup Memory directory as per hlint suggestions

commitdc7aad1501299769194b08691bc5d0c1ccff6b14 authorSanchayan Maity <maitysanchayan@gmail.com> dateWed 12 Feb 2020, 20:33 (7 years ago) parent911242a

3 files changed+4−12

compare with master

unifiedsplit

src/Streamly/Memory/Array.hs−4 src/Streamly/Memory/Malloc.hs+2−6 src/Streamly/Memory/Ring.hs+2−2

src/Streamly/Memory/Array.hs−4

@@ -1,8 +1,4 @@

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE CPP #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

62{-# LANGUAGE ScopedTypeVariables #-}

84#include "inline.hs"

src/Streamly/Memory/Malloc.hs+2−6

@@ -1,11 +1,7 @@

11{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

32{-# LANGUAGE ExistentialQuantification #-}

4−{-# LANGUAGE MagicHash #-}

5−{-# LANGUAGE RecordWildCards #-}

63{-# LANGUAGE ScopedTypeVariables #-}

74{-# LANGUAGE TypeFamilies #-}

8−{-# LANGUAGE UnboxedTuples #-}

95{-# LANGUAGE FlexibleContexts #-}

106

117#include "inline.hs"

@@ -40,8 +36,8 @@ import qualified GHC.ForeignPtr as GHC

4036{-# INLINE mallocForeignPtrAlignedBytes #-}

4137mallocForeignPtrAlignedBytes :: Int -> Int -> IO (GHC.ForeignPtr a)

4238#ifdef USE_GHC_MALLOC

43−mallocForeignPtrAlignedBytes size alignment = do

44− GHC.mallocPlainForeignPtrAlignedBytes size alignment

39+mallocForeignPtrAlignedBytes =

40+ GHC.mallocPlainForeignPtrAlignedBytes

4541#else

4642mallocForeignPtrAlignedBytes size _alignment = do

4743 p <- mallocBytes size

src/Streamly/Memory/Ring.hs+2−2

@@ -69,7 +69,7 @@ new count = do

6969 let size = count * sizeOf (undefined :: a)

7070 fptr <- mallocPlainForeignPtrAlignedBytes size (alignment (undefined :: a))

7171 let p = unsafeForeignPtrToPtr fptr

72− return $ (Ring

72+ return (Ring

7373 { ringStart = fptr

7474 , ringBound = p `plusPtr` size

7575 }, p)

@@ -105,7 +105,7 @@ unsafeEqArrayN :: Ring a -> Ptr a -> A.Array a -> Int -> Bool

105105unsafeEqArrayN Ring{..} rh A.Array{..} n =

106106 let !res = A.unsafeInlineIO $ do

107107 let rs = unsafeForeignPtrToPtr ringStart

108− let as = unsafeForeignPtrToPtr aStart

108+ as = unsafeForeignPtrToPtr aStart

109109 assert (aBound `minusPtr` as >= ringBound `minusPtr` rs) (return ())

110110 let len = ringBound `minusPtr` rh

111111 r1 <- A.memcmp (castPtr rh) (castPtr as) (min len n)