dc7aad1 · streamly · git.iko.soy

src/Streamly/Memory/Array.hs−4

compare with master

unifiedsplit

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

1−{-# LANGUAGE BangPatterns #-}

2{-# LANGUAGE CPP #-}

1{-# LANGUAGE CPP #-}

3−{-# LANGUAGE MagicHash #-}

4−{-# LANGUAGE RecordWildCards #-}

5−{-# LANGUAGE UnboxedTuples #-}

6{-# LANGUAGE ScopedTypeVariables #-}

2{-# LANGUAGE ScopedTypeVariables #-}

7

3

8#include "inline.hs"

4#include "inline.hs"

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

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

1{-# LANGUAGE CPP #-}

2−{-# LANGUAGE BangPatterns #-}

3{-# LANGUAGE ExistentialQuantification #-}

2{-# LANGUAGE ExistentialQuantification #-}

4−{-# LANGUAGE MagicHash #-}

5−{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE ScopedTypeVariables #-}

3{-# LANGUAGE ScopedTypeVariables #-}

7{-# LANGUAGE TypeFamilies #-}

4{-# LANGUAGE TypeFamilies #-}

8−{-# LANGUAGE UnboxedTuples #-}

9{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleContexts #-}

10

6

11#include "inline.hs"

7#include "inline.hs"

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

40{-# INLINE mallocForeignPtrAlignedBytes #-}

36{-# INLINE mallocForeignPtrAlignedBytes #-}

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

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

42#ifdef USE_GHC_MALLOC

38#ifdef USE_GHC_MALLOC

43−mallocForeignPtrAlignedBytes size alignment = do

39+mallocForeignPtrAlignedBytes =

44− GHC.mallocPlainForeignPtrAlignedBytes size alignment

40+ GHC.mallocPlainForeignPtrAlignedBytes

45#else

41#else

46mallocForeignPtrAlignedBytes size _alignment = do

42mallocForeignPtrAlignedBytes size _alignment = do

47 p <- mallocBytes size

43 p <- mallocBytes size

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

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

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

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

71 let p = unsafeForeignPtrToPtr fptr

72− return $ (Ring

72+ return (Ring

73 { ringStart = fptr

74 , ringBound = p `plusPtr` size

75 }, p)

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

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

106 let !res = A.unsafeInlineIO $ do

107 let rs = unsafeForeignPtrToPtr ringStart

108− let as = unsafeForeignPtrToPtr aStart

108+ as = unsafeForeignPtrToPtr aStart

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

110 let len = ringBound `minusPtr` rh

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