From 77f836754cf63bcd8f44dfbf1f8305277700554c Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 14 Nov 2025 16:06:30 -0500 Subject: Redesign LineManager to show one line per namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Allocate one line per namespace (not per concurrent job) - Add Pending state shown as [...] when build hasn't started - Initialize all namespace lines at start showing [...] - Update to [~] when building, [✓]/[x] when complete - Each namespace keeps its line throughout the build - At end, all namespaces show their final status - --jobs controls concurrency, not line count --- Omni/Bild.hs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Omni/Bild.hs') diff --git a/Omni/Bild.hs b/Omni/Bild.hs index 704a47d..90f6cd6 100755 --- a/Omni/Bild.hs +++ b/Omni/Bild.hs @@ -955,13 +955,14 @@ build :: Bool -> Bool -> Int -> Int -> Analysis -> IO [Exit.ExitCode] build andTest loud jobs cpus analysis = do root <- Env.getEnv "CODEROOT" let targets = Map.elems analysis - LogC.withLineManager jobs <| \lineMgr -> do - results <- mapConcurrentlyBounded jobs (buildTarget lineMgr root) targets + let namespaces = map (\Target {..} -> namespace) targets + LogC.withLineManager namespaces <| \lineMgr -> do + LogC.initializeLines lineMgr + results <- mapConcurrentlyBounded jobs (buildTarget root) targets pure (map fst results) where - buildTarget :: LogC.LineManager -> FilePath -> Target -> IO (Exit.ExitCode, ByteString) - buildTarget lineMgr root target@Target {..} = do - _ <- LogC.reserveLine lineMgr namespace + buildTarget :: FilePath -> Target -> IO (Exit.ExitCode, ByteString) + buildTarget root target@Target {..} = do result <- case compiler of CPython -> case out of Just _ -> @@ -1011,7 +1012,7 @@ build andTest loud jobs cpus analysis = do nixBuild loud jobs cpus target Sbcl -> proc loud namespace (toNixFlag compiler) compilerFlags - LogC.releaseCurrentLine namespace (isSuccess (fst result) ?: (LogC.Success, LogC.Failed)) + LogC.updateLineState namespace (isSuccess (fst result) ?: (LogC.Success, LogC.Failed)) pure result data Proc = Proc @@ -1096,7 +1097,7 @@ logs ns src = .> decodeUtf8 .> Text.take (columns - 1) .> (<> "…") - .> LogC.updateCurrentLine ns + .> LogC.updateLine ns .> liftIO ) .| Conduit.foldC -- cgit v1.2.3