posix-timer 0.0.2 → 0.0.3

raw patch · 2 files changed

+36/−3 lines, 2 filesdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• posix-timer.cabal +2/−3
• src/System/Posix/Timer.hsc +34/−0

@@ -1,5 +1,5 @@ Name: posix-timer-Version: 0.0.2+Version: 0.0.3 Category: System Stability: experimental Synopsis: Bindings to POSIX clock and timer functions.@@ -18,8 +18,7 @@ Extra-Source-Files: include/posix-timer.macros.h  Library-  Build-Depends: base == 4.*, unix-  Extensions: CPP, ForeignFunctionInterface, GeneralizedNewtypeDeriving+  Build-Depends: base < 5, unix   Hs-Source-Dirs: src   Include-Dirs: include   GHC-Options: -Wall

@@ -23,6 +23,8 @@     timeSpecNanoseconds,     mkTimeSpec,     timeSpecV,+    timeSpecToNum,+    timeSpecToInt64,     ITimerSpec(..),      Timer,@@ -35,6 +37,7 @@  import Data.Int import Data.Word+import Data.Ratio (numerator) import Foreign.Storable (Storable(..)) import Foreign.Ptr (Ptr, WordPtr, nullPtr, castPtr) import Foreign.Marshal.Alloc (alloca, allocaBytes)@@ -44,13 +47,16 @@                         throwErrnoIfMinus1_) import System.Posix.Types (ProcessID) import System.Posix.Signals (Signal)+import Unsafe.Coerce (unsafeCoerce)  #include <time.h> #include <signal.h>+#include <HsBaseConfig.h> #include <posix-timer.macros.h>  nsPerSecond :: Num a => a nsPerSecond = 1000000000+{-# INLINE nsPerSecond #-}  -- | Mirrors /clockid_t/. newtype Clock = Clock #{itype clockid_t} deriving (Eq, Ord, Show, Storable)@@ -80,7 +86,30 @@ --   Useful as a view pattern. timeSpecV :: TimeSpec -> (CTime, CULong) timeSpecV (TimeSpec s ns) = (s, ns)+{-# INLINE timeSpecV #-} +-- | The total amount of time a 'TimeSpec' represents,+--   in nanoseconds.+timeSpecToNum :: Num a => TimeSpec -> a+timeSpecToNum = fromInteger . numerator . toRational+{-# RULES+"timeSpecToNum/Int64"  timeSpecToNum = timeSpecToInt64+"timeSpecToNum/Word64" timeSpecToNum = \x -> fromIntegral (timeSpecToInt64 x)+  #-}++-- | Specialized version of 'timeSpecToNum'.+timeSpecToInt64 :: TimeSpec -> Int64+timeSpecToInt64 (TimeSpec s ns) =+  let ns64 = fromIntegral ns in+#if HTYPE_TIME_T == Int64+    (unsafeCoerce s :: Int64) * nsPerSecond ++#elif HTYPE_TIME_T == Int32+    (fromIntegral (unsafeCoerce s :: Int32) :: Int64) * nsPerSecond ++#else+# error FIXME: timeSpecToInt64: unexpected HTYPE_TIME_T+#endif+    if s >= 0 then ns64 else -ns64+ instance Ord TimeSpec where   (TimeSpec s1 ns1) `compare` (TimeSpec s2 ns2) =      case s1 `compare` s2 of@@ -109,6 +138,11 @@     TimeSpec 0 (if s < 0 then -1 else (if s == 0 then 0 else nsPerSecond -1))   fromInteger i = TimeSpec (fromInteger s) (fromInteger ns)                     where (s, ns) = i `divMod` nsPerSecond++instance Real TimeSpec where+  toRational (TimeSpec s ns) =+    let rns = toRational ns in+      toRational s * nsPerSecond + if s >= 0 then rns else -rns  #let alignment t = "%lu", (unsigned long) offsetof (struct { char x__; t (y__); }, y__)