cat-file resource pool
Avoid running a large number of git cat-file child processes when run with a large -J value. This implementation takes care to avoid adding any overhead to git-annex when run without -J. When run with -J, there is a small bit of added overhead, to manipulate the resource pool. That optimisation added a fair bit of complexity.
This commit is contained in:
parent
87b7b0f202
commit
cee6b344b4
14 changed files with 243 additions and 47 deletions
6
Annex.hs
6
Annex.hs
|
@ -43,7 +43,6 @@ import qualified Git
|
|||
import qualified Git.Config
|
||||
import qualified Git.Construct
|
||||
import Annex.Fixup
|
||||
import Git.CatFile
|
||||
import Git.HashObject
|
||||
import Git.CheckAttr
|
||||
import Git.CheckIgnore
|
||||
|
@ -68,6 +67,7 @@ import Types.CleanupActions
|
|||
import Types.AdjustedBranch
|
||||
import Types.WorkerPool
|
||||
import Types.IndexFiles
|
||||
import Types.CatFileHandles
|
||||
import qualified Database.Keys.Handle as Keys
|
||||
import Utility.InodeCache
|
||||
import Utility.Url
|
||||
|
@ -116,7 +116,7 @@ data AnnexState = AnnexState
|
|||
, daemon :: Bool
|
||||
, branchstate :: BranchState
|
||||
, repoqueue :: Maybe (Git.Queue.Queue Annex)
|
||||
, catfilehandles :: M.Map FilePath CatFileHandle
|
||||
, catfilehandles :: CatFileHandles
|
||||
, hashobjecthandle :: Maybe HashObjectHandle
|
||||
, checkattrhandle :: Maybe CheckAttrHandle
|
||||
, checkignorehandle :: Maybe CheckIgnoreHandle
|
||||
|
@ -174,7 +174,7 @@ newState c r = do
|
|||
, daemon = False
|
||||
, branchstate = startBranchState
|
||||
, repoqueue = Nothing
|
||||
, catfilehandles = M.empty
|
||||
, catfilehandles = catFileHandlesNonConcurrent
|
||||
, hashobjecthandle = Nothing
|
||||
, checkattrhandle = Nothing
|
||||
, checkignorehandle = Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue