b13ca4d · vty · git.iko.soy

git.iko.soy/vty

yet more optimization of serialize_cap_op

Ignore-this: d8e926915c354cd50f7fd201484d4125 darcs-hash:20100114040815-f0a0d-b30bdbbfdf0c11ed8cc661a46f92ca95ece1a2b6.gz

commitb13ca4dacb041dac127e28cdb17df0eb2961b09d authorcoreyoconnor <coreyoconnor@gmail.com> dateWed 13 Jan 2010, 20:08 (17 years ago) parent4907481

2 files changed+16−21

compare with master

unifiedsplit

src/Data/Terminfo/Eval.hs+7−11 src/Data/Terminfo/Parse.hs+9−10

src/Data/Terminfo/Eval.hs+7−11

@@ -61,11 +61,6 @@ apply_param_ops cap params = foldl apply_param_op params (param_ops cap)

6161apply_param_op :: [CapParam] -> ParamOp -> [CapParam]

6262apply_param_op params IncFirstTwo = map (+ 1) params

6363

64−-- | range is 0-based offset into cap_bytes and count

65−{-# INLINE ptr_at_offset #-}

66−ptr_at_offset :: CapExpression -> Word8 -> Ptr Word8

67−ptr_at_offset cap !offset = fst ( cap_bytes cap ) `plusPtr` ( fromEnum offset )

68−

6964cap_expression_required_bytes :: CapExpression -> [CapParam] -> Word

7065cap_expression_required_bytes cap params =

7166 let params' = apply_param_ops cap params

@@ -77,7 +72,7 @@ cap_ops_required_bytes ops = do

7772 return $ sum counts

7873

7974cap_op_required_bytes :: CapOp -> Eval Word

80−cap_op_required_bytes (Bytes _ c) = return $ toEnum $ fromEnum c

75+cap_op_required_bytes (Bytes _ _ c) = return $ toEnum c

8176cap_op_required_bytes DecOut = do

8277 p <- pop

8378 return $ toEnum $ length $ show p

@@ -160,12 +155,13 @@ serialize_cap_ops :: MonadIO m => OutputBuffer -> CapOps -> EvalT m OutputBuffer

160155serialize_cap_ops out_ptr ops = foldM serialize_cap_op out_ptr ops

161156

162157serialize_cap_op :: MonadIO m => OutputBuffer -> CapOp -> EvalT m OutputBuffer

163−serialize_cap_op out_ptr ( Bytes offset ( W8# byte_count ) ) = do

158+serialize_cap_op out_ptr ( Bytes !offset !byte_count !next_offset ) = do

164159 (cap, _) <- ask

165− let src_ptr = ptr_at_offset cap offset

166− let !i = I# ( word2Int# byte_count )

167− liftIO $! memcpy out_ptr src_ptr ( toEnum $! i )

168− return $! out_ptr `plusPtr` i

160+ let ( !start_ptr, _ ) = cap_bytes cap

161+ !src_ptr = start_ptr `plusPtr` offset

162+ !out_ptr' = out_ptr `plusPtr` next_offset

163+ liftIO $! memcpy out_ptr src_ptr byte_count

164+ return out_ptr'

169165serialize_cap_op out_ptr DecOut = do

170166 p <- pop

171167 let out_str = show p

src/Data/Terminfo/Parse.hs+9−10

@@ -18,14 +18,13 @@ import Data.Array.Unboxed

1818import Data.Monoid

1919import Data.Word

2020

21+import Foreign.C.Types

2122import Foreign.Marshal.Array

2223import Foreign.Ptr

2324

2425import Text.ParserCombinators.Parsec

2526

26−type BytesLength = Word8

27−type BytesOffset = Word8

28−type CapBytes = ( Ptr Word8, Word )

27+type CapBytes = ( Ptr Word8, CSize )

2928

3029data CapExpression = CapExpression

3130 { cap_ops :: !CapOps

@@ -43,7 +42,7 @@ type CapParam = Word

4342

4443type CapOps = [CapOp]

4544data CapOp =

46− Bytes !BytesOffset !BytesLength

45+ Bytes !Int !CSize !Int

4746 | DecOut | CharOut

4847 -- This stores a 0-based index to the parameter. However the operation that implies this op is

4948 -- 1-based

@@ -60,7 +59,7 @@ data CapOp =

6059 deriving ( Show )

6160

6261instance NFData CapOp where

63− rnf (Bytes offset c) = rnf offset >| rnf c

62+ rnf ( Bytes offset count next_offset ) = rnf offset

6463 rnf (PushParam !_pn) = ()

6564 rnf (PushValue !_v) = ()

6665 rnf (Conditional c_expr c_parts) = rnf c_expr >| rnf c_parts

@@ -116,7 +115,7 @@ literal_percent_parser = do

116115 _ <- char '%'

117116 start_offset <- getState >>= return . next_offset

118117 inc_offset 1

119− return $ BuildResults 0 [Bytes start_offset 1] []

118+ return $ BuildResults 0 [Bytes start_offset 1 1] []

120119

121120param_op_parser :: CapParser BuildResults

122121param_op_parser

@@ -286,11 +285,11 @@ bytes_op_parser :: CapParser BuildResults

286285bytes_op_parser = do

287286 bytes <- many1 $ satisfy (/= '%')

288287 start_offset <- getState >>= return . next_offset

289− let !c = toEnum $ length bytes

288+ let !c = length bytes

290289 !s <- getState

291290 let s' = s { next_offset = start_offset + c }

292291 setState s'

293− return $ BuildResults 0 [Bytes start_offset c] []

292+ return $ BuildResults 0 [Bytes start_offset ( toEnum c ) c ] []

294293

295294char_const_parser :: CapParser BuildResults

296295char_const_parser = do

@@ -301,10 +300,10 @@ char_const_parser = do

301300 return $ BuildResults 0 [ PushValue char_value ] [ ]

302301

303302data BuildState = BuildState

304− { next_offset :: Word8

303+ { next_offset :: Int

305304 }

306305

307−inc_offset :: Word8 -> CapParser ()

306+inc_offset :: Int -> CapParser ()

308307inc_offset n = do

309308 s <- getState

310309 let s' = s { next_offset = next_offset s + n }