You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by cl...@apache.org on 2011/02/09 06:27:33 UTC
svn commit: r1068756 - in /thrift/trunk/lib/hs: Thrift.cabal
src/Thrift/Transport/Framed.hs
Author: clavoie
Date: Wed Feb 9 05:27:32 2011
New Revision: 1068756
URL: http://svn.apache.org/viewvc?rev=1068756&view=rev
Log:
Commit client support for framed transport in Haskell from Martin Grabmueller.
THRIFT-538: missing support for framed transport
Added:
thrift/trunk/lib/hs/src/Thrift/Transport/Framed.hs
Modified:
thrift/trunk/lib/hs/Thrift.cabal
Modified: thrift/trunk/lib/hs/Thrift.cabal
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/hs/Thrift.cabal?rev=1068756&r1=1068755&r2=1068756&view=diff
==============================================================================
--- thrift/trunk/lib/hs/Thrift.cabal (original)
+++ thrift/trunk/lib/hs/Thrift.cabal Wed Feb 9 05:27:32 2011
@@ -38,8 +38,9 @@ Library
Build-Depends:
base >= 4, base < 5, network, ghc-prim, binary, bytestring, HTTP
Exposed-Modules:
- Thrift, Thrift.Protocol, Thrift.Transport, Thrift.Protocol.Binary
- Thrift.Transport.Handle, Thrift.Transport.HttpClient, Thrift.Server
+ Thrift, Thrift.Protocol, Thrift.Protocol.Binary, Thrift.Transport,
+ Thrift.Transport.Framed, Thrift.Transport.Handle,
+ Thrift.Transport.HttpClient, Thrift.Server
Extensions:
DeriveDataTypeable, ExistentialQuantification, FlexibleInstances,
KindSignatures, MagicHash, RankNTypes,
Added: thrift/trunk/lib/hs/src/Thrift/Transport/Framed.hs
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/hs/src/Thrift/Transport/Framed.hs?rev=1068756&view=auto
==============================================================================
--- thrift/trunk/lib/hs/src/Thrift/Transport/Framed.hs (added)
+++ thrift/trunk/lib/hs/src/Thrift/Transport/Framed.hs Wed Feb 9 05:27:32 2011
@@ -0,0 +1,238 @@
+{-# LANGUAGE FlexibleInstances #-}
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+module Thrift.Transport.Framed
+ ( module Thrift.Transport
+ , FramedTransport
+ , openFramedTransport
+ ) where
+
+import Thrift.Transport
+
+import Control.Monad (liftM)
+import Data.Monoid (mappend, mempty)
+import Control.Concurrent.MVar
+import qualified Data.Binary as B
+import qualified Data.Binary.Builder as BB
+import qualified Data.ByteString.Lazy as LBS
+
+
+-- | FramedTransport wraps a given transport in framed mode.
+data FramedTransport t = FramedTransport {
+ wrappedTrans :: t, -- ^ Underlying transport.
+ writeBuffer :: WriteBuffer, -- ^ Write buffer.
+ readBuffer :: ReadBuffer -- ^ Read buffer.
+ }
+
+-- | Create a new framed transport which wraps the given transport.
+openFramedTransport :: Transport t => t -> IO (FramedTransport t)
+openFramedTransport trans = do
+ wbuf <- newWriteBuffer
+ rbuf <- newReadBuffer
+ return FramedTransport{ wrappedTrans = trans, writeBuffer = wbuf, readBuffer = rbuf }
+
+instance Transport t => Transport (FramedTransport t) where
+
+ tClose = tClose . wrappedTrans
+
+ tRead trans n = do
+ -- First, check the read buffer for any data.
+ bs <- readBuf (readBuffer trans) n
+ if LBS.null bs
+ then
+ -- When the buffer is empty, read another frame from the
+ -- underlying transport.
+ do len <- readFrame trans
+ if len > 0
+ then tRead trans n
+ else return bs
+ else return bs
+
+ tWrite trans = writeBuf (writeBuffer trans)
+
+ tFlush trans = do
+ bs <- flushBuf (writeBuffer trans)
+ let szBs = B.encode $ LBS.length bs
+ tWrite (wrappedTrans trans) szBs
+ tWrite (wrappedTrans trans) bs
+ tFlush (wrappedTrans trans)
+
+ tIsOpen = tIsOpen . wrappedTrans
+
+readFrame :: Transport t => FramedTransport t -> IO Int
+readFrame trans = do
+ -- Read and decode the frame size.
+ szBs <- tRead (wrappedTrans trans) 4
+ let sz = B.decode szBs
+
+ -- Read the frame and stuff it into the read buffer.
+ bs <- tRead (wrappedTrans trans) sz
+ fillBuf (readBuffer trans) bs
+
+ -- Return the frame size so that the caller knows whether to expect
+ -- something in the read buffer or not.
+ return sz
+
+
+-- Mini IO buffers (stolen from HttpClient.hs)
+
+type WriteBuffer = MVar (BB.Builder)
+
+newWriteBuffer :: IO WriteBuffer
+newWriteBuffer = newMVar mempty
+
+writeBuf :: WriteBuffer -> LBS.ByteString -> IO ()
+writeBuf w s = modifyMVar_ w $ return . (\builder ->
+ builder `mappend` (BB.fromLazyByteString s))
+
+flushBuf :: WriteBuffer -> IO (LBS.ByteString)
+flushBuf w = BB.toLazyByteString `liftM` swapMVar w mempty
+
+
+type ReadBuffer = MVar (LBS.ByteString)
+
+newReadBuffer :: IO ReadBuffer
+newReadBuffer = newMVar mempty
+
+fillBuf :: ReadBuffer -> LBS.ByteString -> IO ()
+fillBuf r s = swapMVar r s >> return ()
+
+readBuf :: ReadBuffer -> Int -> IO (LBS.ByteString)
+readBuf r n = modifyMVar r $ return . flipPair . LBS.splitAt (fromIntegral n)
+ where flipPair (a, b) = (b, a)
+{-# LANGUAGE FlexibleInstances #-}
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+module Thrift.Transport.Framed
+ ( module Thrift.Transport
+ , FramedTransport
+ , openFramedTransport
+ ) where
+
+import Thrift.Transport
+
+import Control.Monad (liftM)
+import Data.Monoid (mappend, mempty)
+import Control.Concurrent.MVar
+import qualified Data.Binary as B
+import qualified Data.Binary.Builder as BB
+import qualified Data.ByteString.Lazy as LBS
+
+
+-- | FramedTransport wraps a given transport in framed mode.
+data FramedTransport t = FramedTransport {
+ wrappedTrans :: t, -- ^ Underlying transport.
+ writeBuffer :: WriteBuffer, -- ^ Write buffer.
+ readBuffer :: ReadBuffer -- ^ Read buffer.
+ }
+
+-- | Create a new framed transport which wraps the given transport.
+openFramedTransport :: Transport t => t -> IO (FramedTransport t)
+openFramedTransport trans = do
+ wbuf <- newWriteBuffer
+ rbuf <- newReadBuffer
+ return FramedTransport{ wrappedTrans = trans, writeBuffer = wbuf, readBuffer = rbuf }
+
+instance Transport t => Transport (FramedTransport t) where
+
+ tClose = tClose . wrappedTrans
+
+ tRead trans n = do
+ -- First, check the read buffer for any data.
+ bs <- readBuf (readBuffer trans) n
+ if LBS.null bs
+ then
+ -- When the buffer is empty, read another frame from the
+ -- underlying transport.
+ do len <- readFrame trans
+ if len > 0
+ then tRead trans n
+ else return bs
+ else return bs
+
+ tWrite trans = writeBuf (writeBuffer trans)
+
+ tFlush trans = do
+ bs <- flushBuf (writeBuffer trans)
+ let szBs = B.encode $ LBS.length bs
+ tWrite (wrappedTrans trans) szBs
+ tWrite (wrappedTrans trans) bs
+ tFlush (wrappedTrans trans)
+
+ tIsOpen = tIsOpen . wrappedTrans
+
+readFrame :: Transport t => FramedTransport t -> IO Int
+readFrame trans = do
+ -- Read and decode the frame size.
+ szBs <- tRead (wrappedTrans trans) 4
+ let sz = B.decode szBs
+
+ -- Read the frame and stuff it into the read buffer.
+ bs <- tRead (wrappedTrans trans) sz
+ fillBuf (readBuffer trans) bs
+
+ -- Return the frame size so that the caller knows whether to expect
+ -- something in the read buffer or not.
+ return sz
+
+
+-- Mini IO buffers (stolen from HttpClient.hs)
+
+type WriteBuffer = MVar (BB.Builder)
+
+newWriteBuffer :: IO WriteBuffer
+newWriteBuffer = newMVar mempty
+
+writeBuf :: WriteBuffer -> LBS.ByteString -> IO ()
+writeBuf w s = modifyMVar_ w $ return . (\builder ->
+ builder `mappend` (BB.fromLazyByteString s))
+
+flushBuf :: WriteBuffer -> IO (LBS.ByteString)
+flushBuf w = BB.toLazyByteString `liftM` swapMVar w mempty
+
+
+type ReadBuffer = MVar (LBS.ByteString)
+
+newReadBuffer :: IO ReadBuffer
+newReadBuffer = newMVar mempty
+
+fillBuf :: ReadBuffer -> LBS.ByteString -> IO ()
+fillBuf r s = swapMVar r s >> return ()
+
+readBuf :: ReadBuffer -> Int -> IO (LBS.ByteString)
+readBuf r n = modifyMVar r $ return . flipPair . LBS.splitAt (fromIntegral n)
+ where flipPair (a, b) = (b, a)