Auto merge of #7398 - ehuss:timings-jobs, r=alexcrichton

-Ztimings: show max jobs/cpus

<img width="295" alt="image" src="https://user-images.githubusercontent.com/43198/65363872-f611a280-dbc2-11e9-8abc-bb5e6e0966d0.png">

Author: bors

src/cargo/core/compiler/job_queue.rs

@@ -445,7 +445,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {
             if !cx.bcx.build_config.build_plan {
                 cx.bcx.config.shell().status("Finished", message)?;
             }
-            self.timings.finished()?;
+            self.timings.finished(cx.bcx)?;
             Ok(())
         } else {
             debug!("queue: {:#?}", self.queue);

src/cargo/core/compiler/timings.rs

@@ -27,8 +27,6 @@ pub struct Timings<'a, 'cfg> {
     start: Instant,
     /// A rendered string of when compilation started.
     start_str: String,
-    /// Some information to display about rustc.
-    rustc_info: String,
     /// A summary of the root units.
     ///
     /// Tuples of `(package_description, target_descrptions)`.
@@ -118,7 +116,6 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             })
             .collect();
         let start_str = humantime::format_rfc3339_seconds(SystemTime::now()).to_string();
-        let rustc_info = render_rustc_info(bcx);
         let profile = if bcx.build_config.release {
             "release"
         } else {
@@ -134,7 +131,6 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             report_json,
             start: bcx.config.creation_time(),
             start_str,
-            rustc_info,
             root_targets,
             profile,
             total_fresh: 0,
@@ -290,21 +286,21 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
     }
 
     /// Call this when all units are finished.
-    pub fn finished(&mut self) -> CargoResult<()> {
+    pub fn finished(&mut self, bcx: &BuildContext<'_, '_>) -> CargoResult<()> {
         if !self.enabled {
             return Ok(());
         }
         self.mark_concurrency(0, 0, 0);
         self.unit_times
             .sort_unstable_by(|a, b| a.start.partial_cmp(&b.start).unwrap());
         if self.report_html {
-            self.report_html()?;
+            self.report_html(bcx)?;
         }
         Ok(())
     }
 
     /// Save HTML report to disk.
-    fn report_html(&self) -> CargoResult<()> {
+    fn report_html(&self, bcx: &BuildContext<'_, '_>) -> CargoResult<()> {
         let duration = self.start.elapsed().as_secs() as u32 + 1;
         let timestamp = self.start_str.replace(&['-', ':'][..], "");
         let filename = format!("cargo-timing-{}.html", timestamp);
@@ -315,7 +311,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             .map(|(name, _targets)| name.as_str())
             .collect();
         f.write_all(HTML_TMPL.replace("{ROOTS}", &roots.join(", ")).as_bytes())?;
-        self.write_summary_table(&mut f, duration)?;
+        self.write_summary_table(&mut f, duration, bcx)?;
         f.write_all(HTML_CANVAS.as_bytes())?;
         self.write_unit_table(&mut f)?;
         writeln!(
@@ -350,7 +346,12 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
     }
 
     /// Render the summary table.
-    fn write_summary_table(&self, f: &mut impl Write, duration: u32) -> CargoResult<()> {
+    fn write_summary_table(
+        &self,
+        f: &mut impl Write,
+        duration: u32,
+        bcx: &BuildContext<'_, '_>,
+    ) -> CargoResult<()> {
         let targets: Vec<String> = self
             .root_targets
             .iter()
@@ -364,6 +365,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
         };
         let total_time = format!("{}s{}", duration, time_human);
         let max_concurrency = self.concurrency.iter().map(|c| c.active).max().unwrap();
+        let rustc_info = render_rustc_info(bcx);
         write!(
             f,
             r#"
@@ -384,7 +386,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
     <td>Total units:</td><td>{}</td>
   </tr>
   <tr>
-    <td>Max concurrency:</td><td>{}</td>
+    <td>Max concurrency:</td><td>{} (jobs={} ncpu={})</td>
   </tr>
   <tr>
     <td>Build start:</td><td>{}</td>
@@ -404,9 +406,11 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             self.total_dirty,
             self.total_fresh + self.total_dirty,
             max_concurrency,
+            bcx.build_config.jobs,
+            num_cpus::get(),
             self.start_str,
             total_time,
-            self.rustc_info,
+            rustc_info,
         )?;
         Ok(())
     }