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

refactor

Browse source
This commit is contained in:
Joey Hess 2015-11-12 16:35:15 -04:00
parent 0f25a7365a
commit 7bd9e33b84
Failed to extract signature
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Utility/LockPool/LockHandle.hs
View file

@ -10,6 +10,7 @@
module Utility.LockPool.LockHandle where module Utility.LockPool.LockHandle where
import qualified Utility.LockPool.STM as P import qualified Utility.LockPool.STM as P
import Utility.LockPool.STM (LockFile)
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Exception import Control.Exception
@ -22,13 +23,18 @@ data LockHandle = LockHandle
data FileLockOps = FileLockOps data FileLockOps = FileLockOps
{ fDropLock :: IO () { fDropLock :: IO ()
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
, fCheckSaneLock :: FilePath -> IO Bool , fCheckSaneLock :: LockFile -> IO Bool
#endif #endif
} }
dropLock :: LockHandle -> IO () dropLock :: LockHandle -> IO ()
dropLock h = P.releaseLock (poolHandle h) (fDropLock (fileLockOps h)) dropLock h = P.releaseLock (poolHandle h) (fDropLock (fileLockOps h))
#ifndef mingw32_HOST_OS
checkSaneLock :: LockFile -> LockHandle -> IO Bool
checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
#endif
-- Take a lock, by first updating the lock pool, and then taking the file -- Take a lock, by first updating the lock pool, and then taking the file
-- lock. If taking the file lock fails for any reason, take care to -- lock. If taking the file lock fails for any reason, take care to
-- release the lock in the lock pool. -- release the lock in the lock pool.

3
Utility/LockPool/PidLock.hs
View file

@ -53,9 +53,6 @@ getLockStatus file = P.getLockStatus P.lockPool file
(StatusLockedBy <$> getProcessID) (StatusLockedBy <$> getProcessID)
(F.getLockStatus file) (F.getLockStatus file)
checkSaneLock :: LockFile -> LockHandle -> IO Bool
checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
mk :: F.LockHandle -> FileLockOps mk :: F.LockHandle -> FileLockOps
mk h = FileLockOps mk h = FileLockOps
{ fDropLock = F.dropLock h { fDropLock = F.dropLock h

3
Utility/LockPool/Posix.hs
View file

@ -67,9 +67,6 @@ getLockStatus file = P.getLockStatus P.lockPool file
(StatusLockedBy <$> getProcessID) (StatusLockedBy <$> getProcessID)
(F.getLockStatus file) (F.getLockStatus file)
checkSaneLock :: LockFile -> LockHandle -> IO Bool
checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
mk :: F.LockHandle -> FileLockOps mk :: F.LockHandle -> FileLockOps
mk h = FileLockOps mk h = FileLockOps
{ fDropLock = F.dropLock h { fDropLock = F.dropLock h