removed repeated CPU time printing in GFI

This commit is contained in:
aarne
2008-08-23 15:35:39 +00:00
parent 65e92e6dab
commit e8e95e140c

View File

@@ -39,6 +39,11 @@ mainGFI opts files = do
loop opts gfenv loop opts gfenv
return () return ()
loopNewCPU gfenv' = do
cpu' <- getCPUTime
putStrLnFlush (show ((cpu' - cputime gfenv') `div` 1000000000) ++ " msec")
return $ gfenv' {cputime = cpu'}
loop :: Options -> GFEnv -> IO GFEnv loop :: Options -> GFEnv -> IO GFEnv
loop opts gfenv0 = do loop opts gfenv0 = do
let env = commandenv gfenv0 let env = commandenv gfenv0
@@ -46,10 +51,6 @@ loop opts gfenv0 = do
setCompletionFunction (Just (wordCompletion gfenv0)) setCompletionFunction (Just (wordCompletion gfenv0))
s0 <- fetchCommand (prompt env) s0 <- fetchCommand (prompt env)
let gfenv = gfenv0 {history = s0 : history gfenv0} let gfenv = gfenv0 {history = s0 : history gfenv0}
let loopNewCPU gfenv' = do
cpu' <- getCPUTime
putStrLnFlush (show ((cpu' - cputime gfenv') `div` 1000000000) ++ " msec")
return $ gfenv' {cputime = cpu'}
let let
enc = encode gfenv enc = encode gfenv
s = decode gfenv s0 s = decode gfenv s0
@@ -119,8 +120,7 @@ loop opts gfenv0 = do
interpretCommandLine enc env s interpretCommandLine enc env s
loopNewCPU gfenv loopNewCPU gfenv
gfenv' <- return $ either (const gfenv) id r gfenv' <- return $ either (const gfenv) id r
e <- loopNewCPU gfenv' loop opts gfenv'
loop opts e
importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv importInEnv :: GFEnv -> Options -> [FilePath] -> IO GFEnv
importInEnv gfenv opts files importInEnv gfenv opts files