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

better lock dropping order

Browse source
This commit is contained in:
Joey Hess 2015-11-13 12:36:37 -04:00
parent bb4123a649
commit e31a51c5bb
Failed to extract signature
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Utility/LockFile/PidLock.hs
View file

@ -20,7 +20,6 @@ import Utility.PartialPrelude
import Utility.Exception import Utility.Exception
import Utility.Applicative import Utility.Applicative
import Utility.Directory import Utility.Directory
import Utility.ThreadScheduler
import Utility.Monad import Utility.Monad
import Utility.Path import Utility.Path
import Utility.FileMode import Utility.FileMode
@ -127,10 +126,14 @@ waitLock (Seconds timeout) lockfile = go timeout
error $ "Gave up waiting for possibly stale pid lock file " ++ lockfile error $ "Gave up waiting for possibly stale pid lock file " ++ lockfile
dropLock :: LockHandle -> IO () dropLock :: LockHandle -> IO ()
dropLock (LockHandle lockfile fd plh) = do dropLock (LockHandle lockfile fd sidelock) = do
-- Drop side lock first, at which point the pid lock will be
-- considered stale.
-- The side lock file cannot be deleted because another process may
-- have it open and be waiting to lock it.
maybe noop Posix.dropLock sidelock
closeFd fd closeFd fd
nukeFile lockfile nukeFile lockfile
maybe noop Posix.dropLock plh
getLockStatus :: LockFile -> IO LockStatus getLockStatus :: LockFile -> IO LockStatus
getLockStatus = maybe StatusUnLocked (StatusLockedBy . lockingPid) <$$> readPidLock getLockStatus = maybe StatusUnLocked (StatusLockedBy . lockingPid) <$$> readPidLock