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

avoid unncessary locking by checkLogFile

Browse source 
Like the comment says, this works without locking. It looks like I
originally copied another function and forgot to remove the locking.

Sponsored-by: Dartmouth College's DANDI project
This commit is contained in:
Joey Hess 2022-09-23 14:01:43 -04:00
parent ed8afacc39
commit b17e328175
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Command/Move.hs
View file

@ -396,8 +396,7 @@ logMove srcuuid destuuid deststartedwithcopy key a = go =<< setup
go logf go logf
-- Only need to check log when there is a copy. -- Only need to check log when there is a copy.
| deststartedwithcopy = do | deststartedwithcopy = do
lck <- fromRepo gitAnnexMoveLock wasnocopy <- checkLogFile (fromRawFilePath logf)
wasnocopy <- checkLogFile (fromRawFilePath logf) lck
(== logline) (== logline)
if wasnocopy if wasnocopy
then go' logf False then go' logf False

4
Logs/File.hs
View file

@ -88,8 +88,8 @@ modifyLogFile f lck modf = withExclusiveLock lck $ do
-- action is concurrently modifying the file. It does not lock the file, -- action is concurrently modifying the file. It does not lock the file,
-- for speed, but instead relies on the fact that a log file usually -- for speed, but instead relies on the fact that a log file usually
-- ends in a newline. -- ends in a newline.
checkLogFile :: FilePath -> RawFilePath -> (L.ByteString -> Bool) -> Annex Bool checkLogFile :: FilePath -> (L.ByteString -> Bool) -> Annex Bool
checkLogFile f lck matchf = withExclusiveLock lck $ bracket setup cleanup go checkLogFile f matchf = bracket setup cleanup go
where where
setup = liftIO $ tryWhenExists $ openFile f ReadMode setup = liftIO $ tryWhenExists $ openFile f ReadMode
cleanup Nothing = noop cleanup Nothing = noop