mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use Utility.PID

Browse source 
fixes build on i386ancient
This commit is contained in:
Joey Hess 2024-08-30 14:56:38 -04:00
parent 3b74386ed4
commit 35ff8c8c00
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/RepoSize/LiveUpdate.hs
View file

@ -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

4
Types/RepoSize.hs
View file

@ -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