Avoid fixed-point implicit dependencies by eagerly loading build tool versions up front

Author: alexfmpe

hie-bios.cabal

@@ -170,6 +170,7 @@ Library
   Build-Depends:
                         base                 >= 4.16 && < 5,
                         aeson                >= 1.4.4 && < 2.3,
+                        async                >= 2.1 && <2.3,
                         base16-bytestring    >= 0.1.1 && < 1.1,
                         bytestring           >= 0.10.8 && < 0.13,
                         co-log-core          ^>= 0.3.0,
@@ -199,7 +200,7 @@ Executable hie-bios
   Main-Is:              Main.hs
   Other-Modules:        Paths_hie_bios
   autogen-modules:      Paths_hie_bios
-  GHC-Options:          -Wall
+  GHC-Options:          -threaded -Wall
   HS-Source-Dirs:       exe
   Build-Depends:        base >= 4.16 && < 5
                       , co-log-core

src/HIE/Bios/Cradle.hs

@@ -1,10 +1,9 @@
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE RecursiveDo #-}
-{-# LANGUAGE RecordWildCards #-}
 module HIE.Bios.Cradle (
       findCradle
     , loadCradle
@@ -28,11 +27,13 @@ module HIE.Bios.Cradle (
 
     -- expose to tests
     , makeVersions
+    , getGhcVersion
     , isCabalMultipleCompSupported
-    , ProgramVersions
+    , BuildToolVersions
   ) where
 
 import Control.Applicative ((<|>), optional)
+import Control.Concurrent.Async (mapConcurrently)
 import Control.DeepSeq
 import Control.Exception (handleJust)
 import qualified Data.Yaml as Yaml
@@ -82,7 +83,6 @@ import GHC.Fingerprint (fingerprintString)
 import GHC.ResponseFile (escapeArgs)
 
 import Data.Version
-import Data.IORef
 import Text.ParserCombinators.ReadP (readP_to_S)
 import Data.Tuple.Extra (fst3, snd3, thd3)
 
@@ -157,35 +157,18 @@ data ResolvedCradles a
  = ResolvedCradles
  { cradleRoot :: FilePath
  , resolvedCradles :: [ResolvedCradle a] -- ^ In order of decreasing specificity
- , cradleProgramVersions :: ProgramVersions
+ , cradleBuildToolVersions :: BuildToolVersions
  }
 
-data ProgramVersions =
-  ProgramVersions { cabalVersion  :: CachedIO (Maybe Version)
-                  , stackVersion  :: CachedIO (Maybe Version)
-                  , ghcVersion    :: CachedIO (Maybe Version)
-                  }
-
-newtype CachedIO a = CachedIO (IORef (Either (IO a) a))
-
-makeCachedIO :: IO a -> IO (CachedIO a)
-makeCachedIO act = CachedIO <$> newIORef (Left act)
-
-runCachedIO :: CachedIO a -> IO a
-runCachedIO (CachedIO ref) =
-  readIORef ref >>= \case
-    Right x -> pure x
-    Left act -> do
-      x <- act
-      writeIORef ref (Right x)
-      pure x
-
-makeVersions :: LogAction IO (WithSeverity Log) -> FilePath -> ([String] -> IO (CradleLoadResult String)) -> IO ProgramVersions
-makeVersions l wdir ghc = do
-  cabalVersion <- makeCachedIO $ getCabalVersion l wdir
-  stackVersion <- makeCachedIO $ getStackVersion l wdir
-  ghcVersion   <- makeCachedIO $ getGhcVersion ghc
-  pure ProgramVersions{..}
+type BuildToolVersions = BuildToolVersions' (Maybe Version)
+data BuildToolVersions' v =
+  BuildToolVersions { cabalVersion  :: v
+                    , stackVersion  :: v
+                    }
+  deriving (Functor, Foldable, Traversable)
+
+makeVersions :: LogAction IO (WithSeverity Log) -> FilePath -> IO BuildToolVersions
+makeVersions l wdir = mapConcurrently (\v -> v l wdir) $ BuildToolVersions getCabalVersion getStackVersion
 
 getCabalVersion :: LogAction IO (WithSeverity Log) -> FilePath -> IO (Maybe Version)
 getCabalVersion l wdir = do
@@ -224,9 +207,11 @@ addActionDeps deps =
       (\err -> CradleFail (err { cradleErrorDependencies = cradleErrorDependencies err `union` deps }))
       (\(ComponentOptions os' dir ds) -> CradleSuccess (ComponentOptions os' dir (ds `union` deps)))
 
-
 resolvedCradlesToCradle :: Show a => LogAction IO (WithSeverity Log) -> (b -> CradleAction a) -> FilePath -> [ResolvedCradle b] -> IO (Cradle a)
-resolvedCradlesToCradle logger buildCustomCradle root cs = mdo
+resolvedCradlesToCradle logger buildCustomCradle root cs = do
+  versions <- makeVersions logger root
+  cradleActions <- for cs $ \c ->
+    fmap (c,) $ resolveCradleAction logger buildCustomCradle (ResolvedCradles root cs versions) root c
   let run_ghc_cmd args =
         -- We're being lazy here and just returning the ghc path for the
         -- first non-none cradle. This shouldn't matter in practice: all
@@ -237,10 +222,6 @@ resolvedCradlesToCradle logger buildCustomCradle root cs = mdo
             runGhcCmd
               act
               args
-  versions <- makeVersions logger root run_ghc_cmd
-  cradleActions <- for cs $ \c ->
-    fmap (c,) $ resolveCradleAction logger buildCustomCradle (ResolvedCradles root cs versions) root c
-  let
       err_msg fp
         = ["Multi Cradle: No prefixes matched"
           , "pwd: " ++ root
@@ -608,16 +589,13 @@ projectLocationOrDefault = \case
 -- Works for new-build by invoking `v2-repl`.
 cabalCradle :: LogAction IO (WithSeverity Log) -> ResolvedCradles b -> FilePath -> Maybe String -> CradleProjectConfig -> IO (CradleAction a)
 cabalCradle l cs wdir mc projectFile = do
-  res <- runCradleResultT $ callCabalPathForCompilerPath l (cradleProgramVersions cs) wdir projectFile
+  res <- runCradleResultT $ callCabalPathForCompilerPath l (cradleBuildToolVersions cs) wdir projectFile
   let
     ghcPath = case res of
       CradleSuccess path -> path
       _ -> Nothing
 
-  pure $ CradleAction
-    { actionName = Types.Cabal
-    , runCradle = \fp -> runCradleResultT . cabalAction cs wdir ghcPath mc l projectFile fp
-    , runGhcCmd = \args -> runCradleResultT $ do
+    runGhcCmd args = runCradleResultT $ do
         case ghcPath of
           Just p -> readProcessWithCwd_ l wdir p args ""
           Nothing -> do
@@ -628,6 +606,13 @@ cabalCradle l cs wdir mc projectFile = do
             -- Need to pass -v0 otherwise we get "resolving dependencies..."
             cabalProc <- cabalProcess l projectFile wdir Nothing "v2-exec" $ ["ghc", "-v0", "--"] ++ args
             readProcessWithCwd' l cabalProc ""
+
+  pure $ CradleAction
+    { actionName = Types.Cabal
+    , runCradle = \fp ls -> do
+        v <- getGhcVersion runGhcCmd
+        runCradleResultT $ cabalAction cs wdir ghcPath v mc l projectFile fp ls
+    , runGhcCmd = runGhcCmd
     }
 
 
@@ -868,9 +853,9 @@ cabalGhcDirs l cabalProject workDir = do
   where
     projectFileArgs = projectFileProcessArgs cabalProject
 
-callCabalPathForCompilerPath :: LogAction IO (WithSeverity Log) -> ProgramVersions -> FilePath -> CradleProjectConfig -> CradleLoadResultT IO (Maybe FilePath)
+callCabalPathForCompilerPath :: LogAction IO (WithSeverity Log) -> BuildToolVersions -> FilePath -> CradleProjectConfig -> CradleLoadResultT IO (Maybe FilePath)
 callCabalPathForCompilerPath l vs workDir projectFile = do
-  isCabalPathSupported vs >>= \case
+  case isCabalPathSupported vs of
     False -> pure Nothing
     True -> do
       let
@@ -885,32 +870,29 @@ callCabalPathForCompilerPath l vs workDir projectFile = do
           pure Nothing
         Right a -> pure a
 
-isCabalPathSupported :: MonadIO m => ProgramVersions -> m Bool
-isCabalPathSupported vs = do
-  v <- liftIO $ runCachedIO $ cabalVersion vs
-  pure $ maybe False (>= makeVersion [3,14]) v
+isCabalPathSupported :: BuildToolVersions -> Bool
+isCabalPathSupported = maybe False (>= makeVersion [3,14]) . cabalVersion
 
-isCabalMultipleCompSupported :: MonadIO m => ProgramVersions -> m Bool
-isCabalMultipleCompSupported vs = do
-  cabal_version <- liftIO $ runCachedIO $ cabalVersion vs
-  ghc_version <- liftIO $ runCachedIO $ ghcVersion vs
+isCabalMultipleCompSupported :: BuildToolVersions -> Maybe Version -> Bool
+isCabalMultipleCompSupported vs ghcVersion = do
   -- determine which load style is supported by this cabal cradle.
-  case (cabal_version, ghc_version) of
-    (Just cabal, Just ghc) -> pure $ ghc >= makeVersion [9, 4] && cabal >= makeVersion [3, 11]
-    _ -> pure False
+  case (cabalVersion vs, ghcVersion) of
+    (Just cabal, Just ghc) -> ghc >= makeVersion [9, 4] && cabal >= makeVersion [3, 11]
+    _ -> False
 
 cabalAction
   :: ResolvedCradles a
   -> FilePath
   -> Maybe FilePath
+  -> Maybe Version
   -> Maybe String
   -> LogAction IO (WithSeverity Log)
   -> CradleProjectConfig
   -> FilePath
   -> LoadStyle
   -> CradleLoadResultT IO ComponentOptions
-cabalAction (ResolvedCradles root cs vs) workDir ghcPath mc l projectFile fp loadStyle = do
-  multiCompSupport <- isCabalMultipleCompSupported vs
+cabalAction (ResolvedCradles root cs vs) workDir ghcPath ghcVersion mc l projectFile fp loadStyle = do
+  let multiCompSupport = isCabalMultipleCompSupported vs ghcVersion
   -- determine which load style is supported by this cabal cradle.
   determinedLoadStyle <- case loadStyle of
     LoadWithContext _ | not multiCompSupport -> do

tests/Utils.hs

@@ -319,8 +319,9 @@ isCabalMultipleCompSupported' :: TestM Bool
 isCabalMultipleCompSupported' = do
   cr <- askCradle
   root <- askRoot
-  versions <- liftIO $ makeVersions (cradleLogger cr) root ((runGhcCmd . cradleOptsProg) cr)
-  liftIO $ isCabalMultipleCompSupported versions
+  versions <- liftIO $ makeVersions (cradleLogger cr) root
+  v <- liftIO $ getGhcVersion ((runGhcCmd . cradleOptsProg) cr)
+  pure $ isCabalMultipleCompSupported versions v
 
 inCradleRootDir :: TestM a -> TestM a
 inCradleRootDir act = do