wip, minor refactoring

hbs2-core/hbs2-core.cabal

@@ -134,6 +134,7 @@ library
                     , microlens-platform
                     , mtl
                     , murmur-hash
+                    , time
                     , network
                     , network-multicast
                     , network-simple

hbs2-core/lib/HBS2/Clock.hs

@@ -1,4 +1,3 @@
-{-# Language FunctionalDependencies #-}
 {-# LANGUAGE CPP #-}
 module HBS2.Clock
   ( module HBS2.Clock
@@ -12,8 +11,9 @@ import Data.Int (Int64)
 import Data.Proxy
 import Prettyprinter
 import System.Clock
+import Data.Time.Clock
 
-data TimeoutKind = MilliSeconds | Seconds | Minutes
+data TimeoutKind = MilliSeconds | Seconds | Minutes | NomDiffTime | TS
 
 data family Timeout ( a :: TimeoutKind )
 
@@ -25,7 +25,6 @@ newtype Delay a = Delay a
                   deriving newtype (Eq,Show,Pretty)
 
 
-
 class IsTimeout a where
   toNanoSeconds :: Timeout a -> Int64
 
@@ -56,6 +55,20 @@ newtype instance Timeout 'Minutes =
   TimeoutMin (Fixed E9)
   deriving newtype (Eq,Ord,Num,Real,Fractional,Show,Pretty)
 
+newtype instance Timeout 'NomDiffTime =
+  TimeoutNDT NominalDiffTime
+  deriving newtype (Eq,Ord,Num,Real,Fractional,Show,Pretty)
+
+newtype instance Timeout 'TS =
+  TimeoutTS TimeSpec
+  deriving newtype (Eq,Ord,Num,Real,Show,Pretty)
+
+instance Pretty NominalDiffTime where
+  pretty = viaShow
+
+instance Pretty TimeSpec where
+  pretty = viaShow
+
 instance IsTimeout 'MilliSeconds where
   toNanoSeconds (TimeoutMSec x) = round (x * 1e6)
 
@@ -65,6 +78,12 @@ instance IsTimeout 'Seconds where
 instance IsTimeout 'Minutes where
   toNanoSeconds (TimeoutMin x) = round (x * 60 * 1e9)
 
+instance IsTimeout 'NomDiffTime where
+  toNanoSeconds (TimeoutNDT t) = round (realToFrac (nominalDiffTimeToSeconds t) * 1e9)
+
+instance IsTimeout 'TS where
+  toNanoSeconds (TimeoutTS s) = fromIntegral $ toNanoSecs s
+
 class Expires a where
   expiresIn :: Proxy a -> Maybe (Timeout 'Seconds)
 

hbs2-peer/app/PeerTypes.hs

@@ -417,7 +417,7 @@ polling :: forall a m . (MonadIO m, Hashable a)
 
 polling o listEntries action = do
 
-  pause (TimeoutSec (nominalDiffTimeToSeconds (waitBefore o)))
+  pause (TimeoutNDT (waitBefore o))
 
   now0 <- getTimeCoarse
   refs0 <- listEntries <&> fmap (set _2 now0) <&> HashMap.fromList
@@ -426,7 +426,7 @@ polling o listEntries action = do
     now <- getTimeCoarse
     refs <- listEntries <&> HashMap.fromList
     let mon' = mon `HashMap.union`
-                 HashMap.fromList [ (e, now + fromNanoSecs (round (realToFrac (nominalDiffTimeToSeconds t) * 1e9)))
+                 HashMap.fromList [ (e, now + toTimeSpec (TimeoutNDT t))
                                   | (e, t) <- HashMap.toList refs
                                   ]
 
@@ -440,11 +440,11 @@ polling o listEntries action = do
         next (HashMap.delete r mon')
 
       Just (Entry t _, _) | otherwise -> do
-        pause @'Seconds $ fromInteger $ round $ realToFrac (toNanoSecs (t - now)) / 1e9
+        pause (TimeoutTS (t - now))
         next mon'
 
       Nothing -> do
-        pause (TimeoutSec (nominalDiffTimeToSeconds (waitOnEmpty o)))
+        pause (TimeoutNDT (waitOnEmpty o))
         next mon'
 
     ) refs0