Parallel compilation: "gf -make -j" and "gf -make -j=n" now work as expected

  * "gf -make -j=n" uses n parallel threads.
  * "gf -make -j" adapts to the number of processors in the system.

This mimics how "cabal build -j" and "ghc --make -j" works.

Support for this is implemented in the new module GF.System.Concurrency and
it depends on the function Control.Concurrent.setNumCapabilities, which is
only available in GHC>=7.6 (base>=4.6). GF can still be compiled with
GHC<7.6, but then you have to use +RTS -N -RTS to take advantage of
multicore processors.

To detect the number of processors in the system, the code depends on a
foreign import of a C function in the GHC run-time system.

1 files changed, 12 insertions, 3 deletions

diff --git a/src/compiler/GF/CompileInParallel.hs b/src/compiler/GF/CompileInParallel.hs
index 07c29febd..7986656ec 100644
--- a/src/compiler/GF/CompileInParallel.hs
+++ b/src/compiler/GF/CompileInParallel.hs
@@ -4,6 +4,7 @@ import Prelude hiding (catch)
 import Control.Monad(join,ap,when,unless)
 import Control.Applicative
 import GF.Infra.Concurrency
+import GF.System.Concurrency
 import System.FilePath
 import qualified GF.System.Directory as D
 import GF.System.Catch(catch,try)
@@ -27,11 +28,12 @@ import qualified Data.ByteString.Lazy as BS
 -- the broken PGF files that can result from mixing different modes in the
 -- same concrete syntax.
 --
--- The first argument is supposed to be the number of jobs to run in
--- parallel, but this has not been implemented yet. Instead you have to
+-- The first argument controls the number of jobs to run in
+-- parallel. This works if GF was compiled with GHC>=7.6, otherwise you have to
 -- use the GHC run-time flag @+RTS -N -RTS@ to enable parallelism.
 parallelBatchCompile jobs opts rootfiles0 =
-  do rootfiles <- mapM canonical rootfiles0
+  do setJobs jobs
+     rootfiles <- mapM canonical rootfiles0
      lib_dir  <- canonical =<< getLibraryDirectory opts
      filepaths <- mapM (getPathFromFile lib_dir opts) rootfiles
      let groups = groupFiles lib_dir filepaths
@@ -66,6 +68,13 @@ parallelBatchCompile jobs opts rootfiles0 =
         dropSlash ('\\':p) = p
         dropSlash p = p
 
+setJobs opt_n =
+  do ok <- setNumCapabilities opt_n
+     when (not ok) $
+       ePutStrLn $ "To set the number of concurrent threads"
+                   ++" you need to use +RTS -N"++maybe "" show opt_n
+                   ++"\n   or recompile GF with ghc>=7.6"
+
 batchCompile1 lib_dir (opts,filepaths) =
   do cwd <- D.getCurrentDirectory
      let rel = relativeTo lib_dir cwd