[project @ 2001-08-04 06:19:54 by ken]

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

diff --git a/ghc/lib/std/CPUTime.hsc b/ghc/lib/std/CPUTime.hsc
index 090f401..da083d7 100644 (file)
--- a/ghc/lib/std/CPUTime.hsc
+++ b/ghc/lib/std/CPUTime.hsc
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- $Id: CPUTime.hsc,v 1.1 2001/05/08 08:55:17 simonmar Exp $
+-- $Id: CPUTime.hsc,v 1.9 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1995-2001
 --
@@ -11,6 +11,7 @@ module CPUTime
         ) where
 
 import PrelMarshalAlloc
+import PrelMarshalUtils ( toBool )
 import PrelCTypesISO
 import PrelCTypes
 import PrelStorable
@@ -19,46 +20,10 @@ import PrelPtr
 import PrelBase                ( Int(..) )
 import PrelByteArr     ( ByteArray(..), newIntArray )
 import PrelArrExtra     ( unsafeFreezeByteArray )
-import PrelIOBase      ( IOException(..), 
-                         IOErrorType( UnsupportedOperation ), 
-                         unsafePerformIO, stToIO, ioException )
+import PrelIOBase      ( IOException(..) )
 import Ratio
 
-#include "config.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifndef mingw32_TARGET_OS
-# ifdef HAVE_SYS_TIMES_H
-#  include <sys/times.h>
-# endif
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#if !defined(mingw32_TARGET_OS) && !defined(irix_TARGET_OS)
-# if defined(HAVE_SYS_RESOURCE_H)
-#  include <sys/resource.h>
-# endif
-#endif
-
-#ifdef hpux_TARGET_OS
-#include <sys/syscall.h>
-#define getrusage(a, b)  syscall(SYS_GETRUSAGE, a, b)
-#define HAVE_GETRUSAGE
-#endif
-
-#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-#endif
+#include "HsStd.h"
 
 -- -----------------------------------------------------------------------------
 -- Computation `getCPUTime' returns the number of picoseconds CPU time
@@ -72,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
@@ -94,14 +59,20 @@ getCPUTime = do
     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
 #else
 # if defined(HAVE_TIMES)
-    allocaBytes (#const sizeof(struct tms)) $ \ p_tms ->
+    allocaBytes (#const sizeof(struct tms)) $ \ p_tms -> do
     times p_tms
     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)
+
+type CTms = ()
+foreign import unsafe times :: Ptr CTms -> CClock
 # else
     ioException (IOError Nothing UnsupportedOperation 
                         "getCPUTime"
@@ -110,51 +81,33 @@ getCPUTime = do
 # endif
 #endif
 
-#else /* _WIN32 */
-
-#error ToDo!!!
-
-#ifdef _WIN32
-/* 100ns units per sec, really */
-#define NS_PER_SEC 10000000LL
-#define FT2usecs(ll,ft)    \
-    (ll)=(ft).dwHighDateTime; \
-    (ll) <<= 32;              \
-    (ll) |= (ft).dwLowDateTime;
-
-#endif
-
-/* cygwin32 or mingw32 version */
-StgInt
-getCPUTime(StgByteArray cpuStruct)
-{
-    FILETIME creationTime, exitTime, kernelTime, userTime;
-    StgInt *cpu=(StgInt *)cpuStruct;
-    unsigned long long uT, kT;
- 
-    /* ToDo: pin down elapsed times to just the OS thread(s) that
-       are evaluating/managing Haskell code.
-    */
-    if (!GetProcessTimes (GetCurrentProcess(), &creationTime,
-                         &exitTime, &kernelTime, &userTime)) {
-       /* Probably on a Win95 box..*/
-        cpu[0]=0;
-        cpu[1]=0;
-        cpu[2]=0;
-        cpu[3]=0;
-       return 1;
-    }
-
-    FT2usecs(uT, userTime);
-    FT2usecs(kT, kernelTime);
-
-    cpu[0] = (unsigned int)(uT / NS_PER_SEC);
-    cpu[1] = (unsigned int)((uT - cpu[0] * NS_PER_SEC) * 100);
-    cpu[2] = (unsigned int)(kT / NS_PER_SEC);
-    cpu[3] = (unsigned int)((kT - cpu[2] * NS_PER_SEC) * 100);
-    return 1;
-}
-#endif /* WIN32 */
+#else /* win32 */
+    allocaBytes (#const sizeof(FILETIME)) $ \ p_creationTime -> do
+    allocaBytes (#const sizeof(FILETIME)) $ \ p_exitTime -> do
+    allocaBytes (#const sizeof(FILETIME)) $ \ p_kernelTime -> do
+    allocaBytes (#const sizeof(FILETIME)) $ \ p_userTime -> do
+    pid <- getCurrentProcess
+    ok <- getProcessTimes pid p_creationTime p_exitTime p_kernelTime p_userTime
+    if toBool ok then do
+      ut <- ft2psecs p_userTime
+      kt <- ft2psecs p_kernelTime
+      return (fromIntegral (ut + kt))
+     else return 0
+  where ft2psecs ft = do
+          high <- (#peek FILETIME,dwHighDateTime) ft :: IO CLong
+          low <- (#peek FILETIME,dwLowDateTime) ft :: IO CLong
+          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.
+
+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
+
+#endif /* not _WIN32 */
 
 cpuTimePrecision :: Integer
 cpuTimePrecision = round ((1000000000000::Integer) % fromIntegral (clockTicks))
@@ -165,8 +118,5 @@ clockTicks =
     (#const CLK_TCK)
 #else
     unsafePerformIO (sysconf (#const _SC_CLK_TCK) >>= return . fromIntegral)
+foreign import unsafe sysconf :: CInt -> IO CLong
 #endif
-
-type CRUsage = ()
-foreign import unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt
-foreign import unsafe sysconf   :: CInt -> IO CLong