start splitting out readonly values from AnnexState
Values in AnnexRead can be read more efficiently, without MVar overhead. Only a few things have been moved into there, and the performance increase so far is not likely to be noticable. This is groundwork for putting more stuff in there, particularly a value that indicates if debugging is enabled. The obvious next step is to change option parsing to not run in the Annex monad to set values in AnnexState, and instead return a pure value that gets stored in AnnexRead.
This commit is contained in:
parent
3204f0bbaa
commit
c2f612292a
20 changed files with 169 additions and 140 deletions
|
@ -139,7 +139,7 @@ runController ichan ochan = do
|
|||
-- Generates a map with a transport for each supported remote in the git repo,
|
||||
-- except those that have annex.sync = false
|
||||
genRemoteMap :: TransportHandle -> TChan Emitted -> IO RemoteMap
|
||||
genRemoteMap h@(TransportHandle (LocalRepo g) _) ochan = do
|
||||
genRemoteMap h@(TransportHandle (LocalRepo g) _ _) ochan = do
|
||||
rs <- Git.Construct.fromRemotes g
|
||||
M.fromList . catMaybes <$> mapM gen rs
|
||||
where
|
||||
|
@ -161,17 +161,18 @@ genRemoteMap h@(TransportHandle (LocalRepo g) _) ochan = do
|
|||
|
||||
genTransportHandle :: IO TransportHandle
|
||||
genTransportHandle = do
|
||||
annexstate <- newMVar =<< Annex.new =<< Git.CurrentRepo.get
|
||||
g <- Annex.repo <$> readMVar annexstate
|
||||
let h = TransportHandle (LocalRepo g) annexstate
|
||||
(st, rd) <- Annex.new =<< Git.CurrentRepo.get
|
||||
mvar <- newMVar st
|
||||
let g = Annex.repo st
|
||||
let h = TransportHandle (LocalRepo g) mvar rd
|
||||
liftAnnex h $ do
|
||||
Annex.setOutput QuietOutput
|
||||
enableInteractiveBranchAccess
|
||||
return h
|
||||
|
||||
updateTransportHandle :: TransportHandle -> IO TransportHandle
|
||||
updateTransportHandle h@(TransportHandle _g annexstate) = do
|
||||
updateTransportHandle h@(TransportHandle _g st rd) = do
|
||||
g' <- liftAnnex h $ do
|
||||
reloadConfig
|
||||
Annex.gitRepo
|
||||
return (TransportHandle (LocalRepo g') annexstate)
|
||||
return (TransportHandle (LocalRepo g') st rd)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue