From 71063b69b36f7d7a7b3525f240098cb3c7f758d8 Mon Sep 17 00:00:00 2001 From: rrt Date: Thu, 28 Jun 2001 16:44:18 +0000 Subject: [PATCH] [project @ 2001-06-28 16:44:18 by rrt] Fix getCPUTime on Windows --- ghc/lib/std/CPUTime.hsc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ghc/lib/std/CPUTime.hsc b/ghc/lib/std/CPUTime.hsc index f5a2859..28a7c7d 100644 --- a/ghc/lib/std/CPUTime.hsc +++ b/ghc/lib/std/CPUTime.hsc @@ -1,5 +1,5 @@ -- ----------------------------------------------------------------------------- --- $Id: CPUTime.hsc,v 1.6 2001/06/22 12:36:33 rrt Exp $ +-- $Id: CPUTime.hsc,v 1.7 2001/06/28 16:44:18 rrt Exp $ -- -- (c) The University of Glasgow, 1995-2001 -- @@ -89,14 +89,14 @@ foreign import unsafe times :: Ptr CTms -> CClock pid <- getCurrentProcess ok <- getProcessTimes pid p_creationTime p_exitTime p_kernelTime p_userTime if toBool ok then do - ut <- ft2usecs p_userTime - kt <- ft2usecs p_kernelTime + ut <- ft2psecs p_userTime + kt <- ft2psecs p_kernelTime return (fromIntegral (ut + kt)) else return 0 - where ft2usecs ft = do + where ft2psecs ft = do high <- (#peek FILETIME,dwHighDateTime) ft :: IO CLong low <- (#peek FILETIME,dwLowDateTime) ft :: IO CLong - return (high * (2^32) + low) + return (((fromIntegral high) * (2^32) + (fromIntegral low)) * 100000) -- ToDo: pin down elapsed times to just the OS thread(s) that -- are evaluating/managing Haskell code. -- 1.7.10.4