From 6591a9b53bdbfdae2b5bef69cfa6bc6e97f0ac35 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Feb 2015 17:22:00 -0400 Subject: avoid fromIntegral overhead --- Database/Fsck.hs | 2 +- Database/Handle.hs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Database') diff --git a/Database/Fsck.hs b/Database/Fsck.hs index e52603d9c..a137cba8e 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -75,4 +75,4 @@ inDb h k = H.runDb h $ do - fsck left off, and making too many commits which slows down the fsck - of lots of small or not present files. -} commitPolicy :: H.CommitPolicy -commitPolicy = H.CommitAfterSeconds 60 +commitPolicy = H.CommitAfter (fromIntegral (60 :: Int)) diff --git a/Database/Handle.hs b/Database/Handle.hs index 59cab0e44..5c4fcca38 100644 --- a/Database/Handle.hs +++ b/Database/Handle.hs @@ -67,7 +67,7 @@ workerThread db jobs = go runDb :: DbHandle -> SqlPersistM a -> IO a runDb h = runDb' h CommitManually -data CommitPolicy = CommitManually | CommitAfterSeconds Int +data CommitPolicy = CommitManually | CommitAfter NominalDiffTime runDb' :: DbHandle -> CommitPolicy -> SqlPersistM a -> IO a runDb' h@(DbHandle _ jobs t) pol a = do @@ -76,11 +76,11 @@ runDb' h@(DbHandle _ jobs t) pol a = do r <- either throwIO return =<< takeMVar res case pol of CommitManually -> return () - CommitAfterSeconds n -> do + CommitAfter n -> do now <- getCurrentTime prev <- takeMVar t putMVar t now - when (diffUTCTime now prev > fromIntegral n) $ + when (diffUTCTime now prev > n) $ commitDb h return r -- cgit v1.2.3