on master help sign in
changing mallocByteString to mallocBS because it is confusing.

Data.ByteString.Internal also provides mallocByteString.

commitfee2e354e647a814d9083b14c85eb914cf9c9d73 authorKazu Yamamoto <kazu@iij.ad.jp> dateFri 10 Jul 2015, 10:04 (11 years ago) parent4b37c94
2 files changed+6−14
warp/Network/Wai/Handler/Warp/Buffer.hs+5−13 warp/Network/Wai/Handler/Warp/Recv.hs+1−1
warp/Network/Wai/Handler/Warp/Buffer.hs+5−13
@@ -4,7 +4,7 @@ module Network.Wai.Handler.Warp.Buffer (
44 bufferSize
55 , allocateBuffer
66 , freeBuffer
7− , mallocByteString
7+ , mallocBS
88 , newBufferPool
99 , withBufferPool
1010 , toBlazeBuffer
@@ -51,20 +51,12 @@ minBufferSize = 2048
5151newBufferPool :: IO BufferPool
5252newBufferPool = newIORef BS.empty
5353
54−mallocByteString :: Int -> IO ByteString
55−mallocByteString size = do
54+mallocBS :: Int -> IO ByteString
55+mallocBS size = do
5656 ptr <- allocateBuffer size
5757 fptr <- newForeignPtr finalizerFree ptr
5858 return $! PS fptr 0 size
59−{-# INLINE mallocByteString #-}
60−
61−{-
62−createBuffer :: Int -> IO ByteString
63−createBuffer size = do
64− fptr <- mallocByteString size
65− return $! PS fptr 0 size
66−{-# INLINE createBuffer #-}
67−-}
59+{-# INLINE mallocBS #-}
6860
6961usefulBuffer :: ByteString -> Bool
7062usefulBuffer buffer = BS.length buffer >= minBufferSize
@@ -73,7 +65,7 @@ usefulBuffer buffer = BS.length buffer >= minBufferSize
7365getBuffer :: BufferPool -> IO ByteString
7466getBuffer pool = do
7567 buffer <- readIORef pool
76− if usefulBuffer buffer then return buffer else mallocByteString largeBufferSize
68+ if usefulBuffer buffer then return buffer else mallocBS largeBufferSize
7769{-# INLINE getBuffer #-}
7870
7971putBuffer :: BufferPool -> ByteString -> IO ()
warp/Network/Wai/Handler/Warp/Recv.hs+1−1
@@ -69,7 +69,7 @@ spell initial siz recv recvBuf
6969 let (bs1, leftover) = BS.splitAt (siz - len0) bs
7070 return (BS.append initial bs1, leftover)
7171 | otherwise = do
72− bs@(PS fptr _ _) <- mallocByteString siz
72+ bs@(PS fptr _ _) <- mallocBS siz
7373 withForeignPtr fptr $ \ptr -> do
7474 ptr' <- copy ptr initial
7575 full <- recvBuf ptr' (siz - len0)