[project @ 2001-09-13 15:54:43 by simonmar]

[ghc-hetmet.git] / ghc / lib / std / CPUTime.hsc

diff --git a/ghc/lib/std/CPUTime.hsc b/ghc/lib/std/CPUTime.hsc
index 7122d67..c34a3cb 100644 (file)
--- a/ghc/lib/std/CPUTime.hsc
+++ b/ghc/lib/std/CPUTime.hsc
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- $Id: CPUTime.hsc,v 1.5 2001/05/29 11:38:14 rrt Exp $
+-- $Id: CPUTime.hsc,v 1.13 2001/09/06 15:15:23 sewardj Exp $
 --
 -- (c) The University of Glasgow, 1995-2001
 --
@@ -7,7 +7,7 @@
 module CPUTime 
        (
          getCPUTime,       -- :: IO Integer
-        cpuTimePrecision  -- :: Integer
+        cpuTimePrecision  -- :: Integer
         ) where
 
 import PrelMarshalAlloc
@@ -37,7 +37,7 @@ import Ratio
 getCPUTime :: IO Integer
 getCPUTime = do
 
-#ifndef _WIN32
+#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
 -- getrusage() is right royal pain to deal with when targetting multiple
 -- versions of Solaris, since some versions supply it in libc (2.3 and 2.5),
 -- while 2.4 has got it in libucb (I wouldn't be too surprised if it was back
@@ -51,10 +51,10 @@ getCPUTime = do
 
     let ru_utime = (#ptr struct rusage, ru_utime) p_rusage
     let ru_stime = (#ptr struct rusage, ru_stime) p_rusage
-    u_sec  <- (#peek struct timeval,tv_sec)  ru_utime :: IO CLong
-    u_usec <- (#peek struct timeval,tv_usec) ru_utime :: IO CLong
-    s_sec  <- (#peek struct timeval,tv_sec)  ru_stime :: IO CLong
-    s_usec <- (#peek struct timeval,tv_usec) ru_stime :: IO CLong
+    u_sec  <- (#peek struct timeval,tv_sec)  ru_utime :: IO CTime
+    u_usec <- (#peek struct timeval,tv_usec) ru_utime :: IO CTime
+    s_sec  <- (#peek struct timeval,tv_sec)  ru_stime :: IO CTime
+    s_usec <- (#peek struct timeval,tv_usec) ru_stime :: IO CTime
 
     return ((fromIntegral u_sec * 1000000 + fromIntegral u_usec + 
              fromIntegral s_sec * 1000000 + fromIntegral s_usec) 
@@ -69,10 +69,10 @@ foreign import unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt
     u_ticks  <- (#peek struct tms,tms_utime) p_tms :: IO CClock
     s_ticks  <- (#peek struct tms,tms_stime) p_tms :: IO CClock
     return (( (fromIntegral u_ticks + fromIntegral s_ticks) * 1000000000000) 
-                       `div` clockTicks)
+                       `div` fromIntegral clockTicks)
 
 type CTms = ()
-foreign import unsafe times :: Ptr CTms -> CClock
+foreign import unsafe times :: Ptr CTms -> IO CClock
 # else
     ioException (IOError Nothing UnsupportedOperation 
                         "getCPUTime"
@@ -81,7 +81,7 @@ foreign import unsafe times :: Ptr CTms -> CClock
 # endif
 #endif
 
-#else /* _WIN32 */
+#else /* win32 */
     allocaBytes (#const sizeof(FILETIME)) $ \ p_creationTime -> do
     allocaBytes (#const sizeof(FILETIME)) $ \ p_exitTime -> do
     allocaBytes (#const sizeof(FILETIME)) $ \ p_kernelTime -> do
@@ -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.