X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Flib%2Fstd%2FTime.hsc;h=c1f12d1dc4d2926bd61c4ee7525cb9303ede0740;hb=9eee6a805af343b8f368c5a05490f27e42e26fb9;hp=78da06b02fa3487a4e0ca7ff71d75f6544634c9e;hpb=8419fa6df5314e2a8195d9f67b775f2f653fbbeb;p=ghc-hetmet.git diff --git a/ghc/lib/std/Time.hsc b/ghc/lib/std/Time.hsc index 78da06b..c1f12d1 100644 --- a/ghc/lib/std/Time.hsc +++ b/ghc/lib/std/Time.hsc @@ -3,7 +3,7 @@ -- to compile on sparc-solaris. Blargh. -- ----------------------------------------------------------------------------- --- $Id: Time.hsc,v 1.6 2001/01/17 16:46:02 sewardj Exp $ +-- $Id: Time.hsc,v 1.12 2001/04/25 14:36:48 simonmar Exp $ -- -- (c) The University of Glasgow, 1995-2001 -- @@ -69,6 +69,9 @@ module Time , Day(..) , ClockTime(..) -- non-standard, lib. report gives this as abstract + -- instance Eq, Ord + -- instance Show (non-standard) + , getClockTime , TimeDiff(..) @@ -100,16 +103,24 @@ module Time # define POSIX_4D9 1 # include # endif -#elif defined(HAVE_TIME_H) +#endif + +#if defined(HAVE_TIME_H) # include #endif -#ifdef HAVE_WINDOWS_H -#include +#ifdef HAVE_SYS_TYPES_H #include +#endif + +#ifdef HAVE_SYS_TIMEB_H #include #endif +#ifdef HAVE_WINDOWS_H +#include +#endif + import Ix import Locale @@ -149,24 +160,13 @@ data ClockTime = TOD Integer -- Seconds since 00:00:00 on 1 Jan 1970 Integer -- Picoseconds with the specified second deriving (Eq, Ord) --- When a @ClockTime@ is shown, it is converted to a string of the form --- @"Mon Nov 28 21:45:41 GMT 1994"@. - --- For now, we are restricted to roughly: --- Fri Dec 13 20:45:52 1901 through Tue Jan 19 03:14:07 2038, because --- we use the C library routines based on 32 bit integers. +-- When a ClockTime is shown, it is converted to a CalendarTime in the current +-- timezone and then printed. FIXME: This is arguably wrong, since we can't +-- get the current timezone without being in the IO monad. instance Show ClockTime where - showsPrec _ (TOD secs _nsec) = - showString $ unsafePerformIO $ do - withObject (fromIntegral secs :: CTime) $ \ p_timer -> do - p_tm <- localtime p_timer -- can't fail, according to POSIX - allocaBytes 64 $ \ p_buf -> do -- big enough for error message - r <- strftime p_buf 50 "%a %b %d %H:%M:%S %Z %Y"## p_tm - if r == 0 - then return "ClockTime.show{Time}: internal error" - else peekCString p_buf - + showsPrec _ t = showString (calendarTimeToString + (unsafePerformIO (toCalendarTime t))) showList = showList__ (showsPrec 0) {- @@ -240,16 +240,12 @@ getClockTime = do usec <- (#peek struct timeval,tv_usec) p_timeval :: IO CLong return (TOD (fromIntegral sec) ((fromIntegral usec) * 1000)) -#elif HAVE_FTIME && !defined(cygwin32_TARGET_OS) - -- - -- ftime() as implemented by cygwin (in B20.1) is - -- not right, so stay away & use time() there instead. - -- +#elif HAVE_FTIME getClockTime = do allocaBytes (#const sizeof(struct timeb)) $ \ p_timeb -> do ftime p_timeb sec <- (#peek struct timeb,time) p_timeb :: IO CTime - msec <- (#peek struct timeb,millitime) p_timeb :: IO CUShort + msec <- (#peek struct timeb,millitm) p_timeb :: IO CUShort return (TOD (fromIntegral sec) (fromIntegral msec * 1000{-ToDo: correct???-})) #else /* use POSIX time() */ @@ -269,7 +265,10 @@ addToClockTime :: TimeDiff -> ClockTime -> ClockTime addToClockTime (TimeDiff year mon day hour min sec psec) (TOD c_sec c_psec) = let - sec_diff = fromInt sec + 60 * fromInt min + 3600 * fromInt hour + 24 * 3600 * fromInt day + sec_diff = toInteger sec + + 60 * toInteger min + + 3600 * toInteger hour + + 24 * 3600 * toInteger day cal = toUTCTime (TOD (c_sec + sec_diff) (c_psec + psec)) -- FIXME! ^^^^ new_mon = fromEnum (ctMonth cal) + r_mon @@ -350,13 +349,18 @@ gmtoff x = (#peek struct tm,tm_gmtoff) x # endif # ifndef mingw32_TARGET_OS foreign label tzname :: Ptr (Ptr CChar) +# else +foreign import "ghcTimezone" unsafe timezone :: Ptr CLong +foreign import "ghcTzname" unsafe tzname :: Ptr (Ptr CChar) +# def inline long *ghcTimezone(void) { return &_timezone; } +# def inline char **ghcTzname(void) { return _tzname; } # endif zone x = do dst <- (#peek struct tm,tm_isdst) x if dst then peekElemOff tzname 1 else peekElemOff tzname 0 # else /* ! HAVE_TZNAME */ -- We're in trouble. If you should end up here, please report this as a bug. -# error Dont know how to get at timezone name on your OS. +# error "Don't know how to get at timezone name on your OS." # endif /* ! HAVE_TZNAME */ -- Get the offset in secs from UTC, if (struct tm) doesn't supply it. */ @@ -474,7 +478,7 @@ toClockTime (CalendarTime year mon mday hour min sec psec -- result. -- gmtoff <- gmtoff p_tm - let res = fromIntegral t + tz - fromIntegral gmtoff + let res = fromIntegral t - tz + fromIntegral gmtoff return (TOD (fromIntegral res) 0) -- ----------------------------------------------------------------------------- @@ -618,7 +622,6 @@ type CTm = () -- struct tm foreign import unsafe localtime :: Ptr CTime -> IO (Ptr CTm) foreign import unsafe gmtime :: Ptr CTime -> IO (Ptr CTm) -foreign import unsafe strftime :: Ptr CChar -> CSize -> Addr## -> Ptr CTm -> IO CSize foreign import unsafe mktime :: Ptr CTm -> IO CTime foreign import unsafe time :: Ptr CTime -> IO CTime @@ -629,5 +632,9 @@ foreign import unsafe gettimeofday :: Ptr CTimeVal -> Ptr () -> IO CInt #if HAVE_FTIME type CTimeB = () +#ifndef mingw32_TARGET_OS foreign import unsafe ftime :: Ptr CTimeB -> IO CInt +#else +foreign import unsafe ftime :: Ptr CTimeB -> IO () +#endif #endif