diff --git a/Annex/RepoSize/LiveUpdate.hs b/Annex/RepoSize/LiveUpdate.hs index dae7abe575..a792b42597 100644 --- a/Annex/RepoSize/LiveUpdate.hs +++ b/Annex/RepoSize/LiveUpdate.hs @@ -18,9 +18,9 @@ import Annex.LockFile import Annex.LockPool import qualified Database.RepoSize as Db import qualified Utility.Matcher as Matcher +import Utility.PID import Control.Concurrent -import System.Process import Text.Read import Data.Time.Clock.POSIX import qualified Utility.RawFilePath as R @@ -61,7 +61,7 @@ prepareLiveUpdate mu k sc = do waitstart startv readyv donev h u = tryNonAsync (takeMVar startv) >>= \case Right () -> do - pid <- getCurrentPid + pid <- getPID cid <- mkSizeChangeId pid Db.startingLiveSizeChange h u k sc cid putMVar readyv () @@ -145,7 +145,7 @@ finishedLiveUpdate lu u k sc = checkStaleSizeChanges :: RepoSizeHandle -> Annex () checkStaleSizeChanges h@(RepoSizeHandle (Just _) livev) = do livedir <- calcRepo' gitAnnexRepoSizeLiveDir - pid <- liftIO getCurrentPid + pid <- liftIO getPID let pidlockfile = show pid now <- liftIO getPOSIXTime liftIO (takeMVar livev) >>= \case diff --git a/Types/RepoSize.hs b/Types/RepoSize.hs index 870aaea5e4..a94b7c21d3 100644 --- a/Types/RepoSize.hs +++ b/Types/RepoSize.hs @@ -11,12 +11,12 @@ module Types.RepoSize where import Types.UUID import Types.Key +import Utility.PID import Control.Concurrent import Database.Persist.Sql hiding (Key) import Data.Unique import Text.Read -import System.Process (Pid) import qualified Data.Text as T import qualified Data.Set as S @@ -75,7 +75,7 @@ newtype SizeChangeUniqueId = SizeChangeUniqueId Int newtype SizeChangeProcessId = SizeChangeProcessId Integer deriving (Show, Eq, Ord) -mkSizeChangeId :: Pid -> IO SizeChangeId +mkSizeChangeId :: PID -> IO SizeChangeId mkSizeChangeId pid = do u <- newUnique return $ SizeChangeId