import Data.ByteString.Lazy.Char8 (ByteString)
import qualified Data.Sequence as S
import Data.Sequence (Seq)
-import Network
+import Network.Socket
import Network.HTTP.Lucu.Config
import Network.HTTP.Lucu.HttpVersion
import Network.HTTP.Lucu.Request
import Network.HTTP.Lucu.Response
data Interaction = Interaction {
- itrConfig :: Config
- , itrRemoteHost :: HostName
- , itrResourcePath :: Maybe [String]
- , itrRequest :: Maybe Request
- , itrResponse :: TVar Response
+ itrConfig :: !Config
+ , itrRemoteAddr :: !SockAddr
+ , itrResourcePath :: !(Maybe [String])
+ , itrRequest :: !(TVar (Maybe Request))
+ , itrResponse :: !(TVar Response)
-- FIXME: この三つは本來 TVar であるべきでないので、唯の Bool にす
-- るに越した事は無いが、それは重要でない。そんな golf で自分の貴重
-- な時間を /dev/null に突っ込むのは、他にしたい事が何も無くなって
-- からにすべき。
- , itrRequestHasBody :: TVar Bool
- , itrRequestIsChunked :: TVar Bool
- , itrExpectedContinue :: TVar Bool
+ , itrRequestHasBody :: !(TVar Bool)
+ , itrRequestIsChunked :: !(TVar Bool)
+ , itrExpectedContinue :: !(TVar Bool)
- , itrReqChunkLength :: TVar (Maybe Int)
- , itrReqChunkRemaining :: TVar (Maybe Int)
- , itrReqChunkIsOver :: TVar Bool
- , itrReqBodyWanted :: TVar (Maybe Int)
- , itrReqBodyWasteAll :: TVar Bool
- , itrReceivedBody :: TVar ByteString -- Resource が受領した部分は削除される
+ , itrReqChunkLength :: !(TVar (Maybe Int))
+ , itrReqChunkRemaining :: !(TVar (Maybe Int))
+ , itrReqChunkIsOver :: !(TVar Bool)
+ , itrReqBodyWanted :: !(TVar (Maybe Int))
+ , itrReqBodyWasteAll :: !(TVar Bool)
+ , itrReceivedBody :: !(TVar ByteString) -- Resource が受領した部分は削除される
- , itrWillReceiveBody :: TVar Bool
- , itrWillChunkBody :: TVar Bool
- , itrWillDiscardBody :: TVar Bool
- , itrWillClose :: TVar Bool
+ , itrWillReceiveBody :: !(TVar Bool)
+ , itrWillChunkBody :: !(TVar Bool)
+ , itrWillDiscardBody :: !(TVar Bool)
+ , itrWillClose :: !(TVar Bool)
- , itrBodyToSend :: TVar ByteString
- , itrBodyIsNull :: TVar Bool
+ , itrBodyToSend :: !(TVar ByteString)
+ , itrBodyIsNull :: !(TVar Bool)
- , itrState :: TVar InteractionState
+ , itrState :: !(TVar InteractionState)
- , itrWroteContinue :: TVar Bool
- , itrWroteHeader :: TVar Bool
+ , itrWroteContinue :: !(TVar Bool)
+ , itrWroteHeader :: !(TVar Bool)
}
-- Resource の視點で見た時の状態。常に上から下へ行き、逆行しない。初期
defaultPageContentType = "application/xhtml+xml"
-newInteraction :: Config -> HostName -> Maybe Request -> IO Interaction
-newInteraction conf host req
- = do responce <- newTVarIO $ Response {
+newInteraction :: Config -> SockAddr -> Maybe Request -> IO Interaction
+newInteraction conf addr req
+ = conf `seq` addr `seq` req `seq`
+ do request <- newTVarIO $ req
+ responce <- newTVarIO $ Response {
resVersion = HttpVersion 1 1
, resStatus = Ok
, resHeaders = [("Content-Type", defaultPageContentType)]
return $ Interaction {
itrConfig = conf
- , itrRemoteHost = host
+ , itrRemoteAddr = addr
, itrResourcePath = Nothing
- , itrRequest = req
+ , itrRequest = request
, itrResponse = responce
, itrRequestHasBody = requestHasBody
writeItr :: Interaction -> (Interaction -> TVar a) -> a -> STM ()
writeItr itr accessor value
- = writeTVar (accessor itr) value
+ = itr `seq` accessor `seq` value `seq`
+ writeTVar (accessor itr) value
readItr :: Interaction -> (Interaction -> TVar a) -> (a -> b) -> STM b
readItr itr accessor reader
- = readTVar (accessor itr) >>= return . reader
+ = itr `seq` accessor `seq` reader `seq`
+ readTVar (accessor itr) >>= return . reader
-readItrF :: (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> b) -> STM (f b)
+readItrF :: Functor f => Interaction -> (Interaction -> TVar (f a)) -> (a -> b) -> STM (f b)
readItrF itr accessor reader
- = readItr itr accessor (fmap reader)
+ = itr `seq` accessor `seq` reader `seq`
+ readItr itr accessor (fmap reader)
+{-# SPECIALIZE readItrF :: Interaction -> (Interaction -> TVar (Maybe a)) -> (a -> b) -> STM (Maybe b) #-}
updateItr :: Interaction -> (Interaction -> TVar a) -> (a -> a) -> STM ()
updateItr itr accessor updator
- = do old <- readItr itr accessor id
+ = itr `seq` accessor `seq` updator `seq`
+ do old <- readItr itr accessor id
writeItr itr accessor (updator old)
-updateItrF :: (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> a) -> STM ()
+updateItrF :: Functor f => Interaction -> (Interaction -> TVar (f a)) -> (a -> a) -> STM ()
updateItrF itr accessor updator
- = updateItr itr accessor (fmap updator)
+ = itr `seq` accessor `seq` updator `seq`
+ updateItr itr accessor (fmap updator)
+{-# SPECIALIZE updateItrF :: Interaction -> (Interaction -> TVar (Maybe a)) -> (a -> a) -> STM () #-}
\ No newline at end of file