annex.jobs

Added annex.jobs setting, which is like using the -J option.

Of course, -J overrides annex.jobs.

This commit was sponsored by Trenton Cronholm on Patreon.
This commit is contained in:
Joey Hess 2018-10-04 12:47:27 -04:00
parent 585e6b39aa
commit 6ba3dea566
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 46 additions and 17 deletions

View file

@ -13,7 +13,6 @@ import Options.Applicative
#if ! MIN_VERSION_optparse_applicative(0,14,1)
import Options.Applicative.Builder.Internal
#endif
import Control.Concurrent
import qualified Data.Map as M
import Annex.Common
@ -370,11 +369,7 @@ jobsOption =
)
]
where
set n = do
Annex.changeState $ \s -> s { Annex.concurrency = Concurrent n }
c <- liftIO getNumCapabilities
when (n > c) $
liftIO $ setNumCapabilities n
set n = Annex.changeState $ \s -> s { Annex.concurrency = Concurrent n }
timeLimitOption :: [GlobalOption]
timeLimitOption =