feat(build-analysis): wire logger into build process

Author: weihanglo

src/cargo/core/compiler/build_context/mod.rs

@@ -9,6 +9,7 @@ use crate::util::Rustc;
 use crate::util::context::GlobalContext;
 use crate::util::errors::CargoResult;
 use crate::util::interning::InternedString;
+use crate::util::logger::BuildLogger;
 use std::collections::{HashMap, HashSet};
 
 mod target_info;
@@ -50,6 +51,9 @@ pub struct BuildContext<'a, 'gctx> {
     /// The cargo context.
     pub gctx: &'gctx GlobalContext,
 
+    /// Build logger for `-Zbuild-analysis`.
+    pub logger: Option<&'a BuildLogger>,
+
     /// This contains a collection of compiler flags presets.
     pub profiles: Profiles,
 
@@ -83,6 +87,7 @@ pub struct BuildContext<'a, 'gctx> {
 impl<'a, 'gctx> BuildContext<'a, 'gctx> {
     pub fn new(
         ws: &'a Workspace<'gctx>,
+        logger: Option<&'a BuildLogger>,
         packages: PackageSet<'gctx>,
         build_config: &'a BuildConfig,
         profiles: Profiles,
@@ -102,6 +107,7 @@ impl<'a, 'gctx> BuildContext<'a, 'gctx> {
         Ok(BuildContext {
             ws,
             gctx: ws.gctx(),
+            logger,
             packages,
             build_config,
             profiles,

src/cargo/core/compiler/job_queue/mod.rs

@@ -1124,7 +1124,7 @@ impl<'gctx> DrainState<'gctx> {
         }
         let unlocked = self.queue.finish(unit, &artifact);
         match artifact {
-            Artifact::All => self.timings.unit_finished(id, unlocked),
+            Artifact::All => self.timings.unit_finished(build_runner, id, unlocked),
             Artifact::Metadata => self.timings.unit_rmeta_finished(id, unlocked),
         }
         Ok(())

src/cargo/core/compiler/timings.rs

@@ -314,7 +314,12 @@ impl<'gctx> Timings<'gctx> {
     }
 
     /// Mark that a unit has finished running.
-    pub fn unit_finished(&mut self, id: JobId, unlocked: Vec<&Unit>) {
+    pub fn unit_finished(
+        &mut self,
+        _build_runner: &BuildRunner<'_, '_>,
+        id: JobId,
+        unlocked: Vec<&Unit>,
+    ) {
         if !self.enabled {
             return;
         }

src/cargo/ops/cargo_compile/mod.rs

@@ -173,7 +173,7 @@ pub fn compile_ws<'a>(
         });
     }
 
-    let bcx = create_bcx(ws, options, &interner)?;
+    let bcx = create_bcx(ws, options, &interner, logger.as_ref())?;
 
     if options.build_config.unit_graph {
         unit_graph::emit_serialized_unit_graph(&bcx.roots, &bcx.unit_graph, ws.gctx())?;
@@ -232,6 +232,7 @@ pub fn create_bcx<'a, 'gctx>(
     ws: &'a Workspace<'gctx>,
     options: &'a CompileOptions,
     interner: &'a UnitInterner,
+    logger: Option<&'a BuildLogger>,
 ) -> CargoResult<BuildContext<'a, 'gctx>> {
     let CompileOptions {
         ref build_config,
@@ -586,6 +587,7 @@ where `<compatible-ver>` is the latest version supporting rustc {rustc_version}"
 
     let bcx = BuildContext::new(
         ws,
+        logger,
         pkg_set,
         build_config,
         profiles,

src/cargo/util/mod.rs

@@ -57,7 +57,7 @@ pub mod job;
 pub mod lints;
 mod lockserver;
 pub mod log_message;
-mod logger;
+pub mod logger;
 pub mod machine_message;
 pub mod network;
 mod once;