[project @ 2002-04-26 13:34:05 by simonmar]

[haskell-directory.git] / System / CPUTime.hsc

diff --git a/System/CPUTime.hsc b/System/CPUTime.hsc
index d672817..e5a8a45 100644 (file)
--- a/System/CPUTime.hsc
+++ b/System/CPUTime.hsc
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- 
+-- |
 -- Module      :  System.CPUTime
 -- Copyright   :  (c) The University of Glasgow 2001
 -- License     :  BSD-style (see the file libraries/core/LICENSE)
@@ -8,8 +8,6 @@
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: CPUTime.hsc,v 1.2 2001/06/29 09:44:03 simonmar Exp $
---
 -- The standard CPUTime library.
 --
 -----------------------------------------------------------------------------
@@ -17,7 +15,7 @@
 module System.CPUTime 
        (
          getCPUTime,       -- :: IO Integer
-        cpuTimePrecision  -- :: Integer
+        cpuTimePrecision  -- :: Integer
         ) where
 
 import Prelude
@@ -27,7 +25,7 @@ import Foreign.C
 
 import Data.Ratio
 
-#include "HsCore.h"
+#include "HsBase.h"
 
 -- -----------------------------------------------------------------------------
 -- Computation `getCPUTime' returns the number of picoseconds CPU time
@@ -41,7 +39,7 @@ import Data.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
@@ -55,17 +53,17 @@ 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) 
                * 1000000)
 
 type CRUsage = ()
-foreign import unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt
+foreign import ccall unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt
 #else
 # if defined(HAVE_TIMES)
     allocaBytes (#const sizeof(struct tms)) $ \ p_tms -> do
@@ -73,10 +71,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 ccall unsafe times :: Ptr CTms -> IO CClock
 # else
     ioException (IOError Nothing UnsupportedOperation 
                         "getCPUTime"
@@ -85,7 +83,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
@@ -108,8 +106,8 @@ foreign import unsafe times :: Ptr CTms -> CClock
 type FILETIME = ()
 type HANDLE = ()
 -- need proper Haskell names (initial lower-case character)
-foreign import "GetCurrentProcess" unsafe getCurrentProcess :: IO (Ptr HANDLE)
-foreign import "GetProcessTimes" unsafe getProcessTimes :: Ptr HANDLE -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> IO CInt
+foreign import ccall unsafe "GetCurrentProcess" getCurrentProcess :: IO (Ptr HANDLE)
+foreign import ccall unsafe "GetProcessTimes" getProcessTimes :: Ptr HANDLE -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> IO CInt
 
 #endif /* not _WIN32 */
 
@@ -122,5 +120,5 @@ clockTicks =
     (#const CLK_TCK)
 #else
     unsafePerformIO (sysconf (#const _SC_CLK_TCK) >>= return . fromIntegral)
-foreign import unsafe sysconf :: CInt -> IO CLong
+foreign import ccall unsafe sysconf :: CInt -> IO CLong
 #endif