GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

GF.CompileInParallel: get rid of the cryptic 'thread blocked indefinitely in an MVar operation' message after compilation errors

Browse Source 
Instead show a message saying how many modules were affected by the compilation
errors.
This commit is contained in:
hallgren
2015-03-31 13:26:51 +00:00
parent bab4e7f872
commit 33442e6b4f
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiler/GF/CompileInParallel.hs
View File

@@ -6,7 +6,7 @@ import Control.Applicative
import GF.Infra.Concurrency import GF.Infra.Concurrency
import System.FilePath import System.FilePath
import qualified GF.System.Directory as D import qualified GF.System.Directory as D
import GF.System.Catch(catch) import GF.System.Catch(catch,try)
import Data.List(nub,isPrefixOf,intercalate,partition) import Data.List(nub,isPrefixOf,intercalate,partition)
import qualified Data.Map as M import qualified Data.Map as M
import GF.Compile.ReadFiles(getOptionsFromFile,findFile,gfImports,gfoImports) import GF.Compile.ReadFiles(getOptionsFromFile,findFile,gfImports,gfoImports)
@@ -116,12 +116,13 @@ batchCompile1 lib_dir (opts,filepaths) =
return file' return file'
compile cache (file,paths) = readIOCache cache (file,Hide paths) compile cache (file,paths) = readIOCache cache (file,Hide paths)
compile' cache (f,Hide ps) = compile' cache (f,Hide ps) =
try $
do let compileImport f = compile cache (f,ps) do let compileImport f = compile cache (f,ps)
findImports (f,ps) = mapM (find f ps) . nub . snd findImports (f,ps) = mapM (find f ps) . nub . snd
=<< getImports opts f =<< getImports opts f
imps <- ok (findImports (f,ps)) imps <- ok (findImports (f,ps))
modifyMVar_ deps (return . M.insert f imps) modifyMVar_ deps (return . M.insert f imps)
tis <- parMapM compileImport imps ([],tis) <- splitEither <$> parMapM compileImport imps
let reuse gfo = do t <- D.getModificationTime gfo let reuse gfo = do t <- D.getModificationTime gfo
gr <- readMVar sgr gr <- readMVar sgr
r <- lazyIO $ ok (reuseGFO opts gr gfo) r <- lazyIO $ ok (reuseGFO opts gr gfo)
@@ -142,7 +143,7 @@ batchCompile1 lib_dir (opts,filepaths) =
extendSgr sgr mo extendSgr sgr mo
return (maximum (t:tis)) return (maximum (t:tis))
cache <- liftIO $ newIOCache compile' cache <- liftIO $ newIOCache compile'
ts <- liftIO $ parMapM (compile cache) filepaths (es,ts) <- liftIO $ splitEither <$> parMapM (compile cache) filepaths
gr <- readMVar sgr gr <- readMVar sgr
let cnc = moduleNameS (justModuleName (fst (last filepaths))) let cnc = moduleNameS (justModuleName (fst (last filepaths)))
ds <- M.toList <$> readMVar deps ds <- M.toList <$> readMVar deps
@@ -154,7 +155,13 @@ batchCompile1 lib_dir (opts,filepaths) =
putStrLnE $ render $ putStrLnE $ render $
length ds<+>"modules in" length ds<+>"modules in"
<+>length (nub (map (dropFileName.fst) ds))<+>"directories." <+>length (nub (map (dropFileName.fst) ds))<+>"directories."
return (maximum ts,(cnc,gr)) let n = length es
if n>0
then fail $ "Errors prevented "++show n++" module"++['s'|n/=1]++
" from being compiled."
else return (maximum ts,(cnc,gr))
splitEither es = ([x|Left x<-es],[y|Right y<-es])
canonical path = liftIO $ D.canonicalizePath path `catch` const (return path) canonical path = liftIO $ D.canonicalizePath path `catch` const (return path)