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

sim: avoid step looking for new actions every time

Browse source 
Once it has a list of actions, it can perform them all.

A disappointing optimisation at least in my test case, which it sped up
by less than 1 second out of 12. But still it did make it faster.
This commit is contained in:
Joey Hess 2024-09-23 15:50:47 -04:00
parent 969e6c2747
commit eec07aec68
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Annex/Sim.hs
View file

@ -491,22 +491,30 @@ handleStep :: Int -> Int -> SimState SimRepo -> Annex (SimState SimRepo)
handleStep startn n st
| n > 0 = do
let (st', actions) = getactions unsyncactions st
(st'', nothingtodo) <- runoneaction actions st'
if nothingtodo
(st'', restactions) <- runoneaction actions st'
if null restactions
then do
let (st''', actions') = getactions [ActionSync] st''
(st'''', stable) <- runoneaction actions' st'''
if stable
(st'''', restactions') <- runoneaction actions' st'''
if null restactions'
then do
showLongNote $ UnquotedString $
"Simulation has stabilized after "
++ show (startn - n)
++ " steps."
return st''''
else handleStep startn (pred n) st''''
else handleStep startn (pred n) st''
else runrest restactions' st'''' (pred n)
else runrest restactions st'' (pred n)
| otherwise = return st
where
runrest actions st' n'
| n > 0 = do
(st'', restactions) <- runoneaction actions st'
if null restactions
then handleStep startn n' st'
else runrest restactions st'' (pred n')
| otherwise = return st'
unsyncactions =
[ ActionGetWanted
, ActionSendWanted
@ -530,7 +538,7 @@ handleStep startn n st
Right (Right st'') -> getcomponents c st'' as
Right (Left (st'', cs)) -> getcomponents (cs:c) st'' as
runoneaction [] st' = return (st', True)
runoneaction [] st' = return (st', [])
runoneaction actions st' = do
let (idx, st'') = simRandom st'
(randomR (0, length actions - 1))
@ -539,7 +547,7 @@ handleStep startn n st
let restactions = take idx actions ++ drop (idx+1) actions
action st'' >>= \case
(st''', False) -> runoneaction restactions st'''
(st''', True) -> return (st''', False)
(st''', True) -> return (st''', restactions)
getSimActionComponents
:: SimAction