Auto merge of #7872 - ehuss:timings-error, r=Eh2406

bors · bors · commit c55d3636c845 · 2020-02-06T18:57:21.000Z
Emit report on error with Ztimings. Previously the report was not saved on error. I'm not actually sure this is all that useful. I was using it to gather a picture of what was being built (I wasn't actually interested in the timing data). There might be better ways to accomplish what I wanted, but it's a small change, so probably doesn't hurt. Fixes #7413.
diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
@@ -676,6 +676,7 @@ impl<'a, 'cfg> DrainState<'a, 'cfg> {
         }
 
         let time_elapsed = util::elapsed(cx.bcx.config.creation_time().elapsed());
+        self.timings.finished(cx.bcx, &error)?;
 
         if let Some(e) = error {
             Err(e)
@@ -687,7 +688,6 @@ impl<'a, 'cfg> DrainState<'a, 'cfg> {
             if !cx.bcx.build_config.build_plan {
                 cx.bcx.config.shell().status("Finished", message)?;
             }
-            self.timings.finished(cx.bcx)?;
             Ok(())
         } else {
             debug!("queue: {:#?}", self.queue);
diff --git a/src/cargo/core/compiler/timings.rs b/src/cargo/core/compiler/timings.rs
@@ -293,21 +293,29 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
     }
 
     /// Call this when all units are finished.
-    pub fn finished(&mut self, bcx: &BuildContext<'_, '_>) -> CargoResult<()> {
+    pub fn finished(
+        &mut self,
+        bcx: &BuildContext<'_, '_>,
+        error: &Option<anyhow::Error>,
+    ) -> CargoResult<()> {
         if !self.enabled {
             return Ok(());
         }
         self.mark_concurrency(0, 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(bcx)?;
+            self.report_html(bcx, error)?;
         }
         Ok(())
     }
 
     /// Save HTML report to disk.
-    fn report_html(&self, bcx: &BuildContext<'_, '_>) -> CargoResult<()> {
+    fn report_html(
+        &self,
+        bcx: &BuildContext<'_, '_>,
+        error: &Option<anyhow::Error>,
+    ) -> CargoResult<()> {
         let duration = d_as_f64(self.start.elapsed());
         let timestamp = self.start_str.replace(&['-', ':'][..], "");
         let filename = format!("cargo-timing-{}.html", timestamp);
@@ -318,7 +326,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, bcx)?;
+        self.write_summary_table(&mut f, duration, bcx, error)?;
         f.write_all(HTML_CANVAS.as_bytes())?;
         self.write_unit_table(&mut f)?;
         // It helps with pixel alignment to use whole numbers.
@@ -359,6 +367,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
         f: &mut impl Write,
         duration: f64,
         bcx: &BuildContext<'_, '_>,
+        error: &Option<anyhow::Error>,
     ) -> CargoResult<()> {
         let targets: Vec<String> = self
             .root_targets
@@ -380,6 +389,17 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             .max()
             .unwrap();
         let rustc_info = render_rustc_info(bcx);
+        let error_msg = match error {
+            Some(e) => format!(
+                r#"\
+  <tr>
+    <td class="error-text">Error:</td><td>{}</td>
+  </tr>
+"#,
+                e
+            ),
+            None => "".to_string(),
+        };
         write!(
             f,
             r#"
@@ -414,7 +434,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
   <tr>
     <td>Max (global) rustc threads concurrency:</td><td>{}</td>
   </tr>
-
+{}
 </table>
 "#,
             targets,
@@ -429,6 +449,7 @@ impl<'a, 'cfg> Timings<'a, 'cfg> {
             total_time,
             rustc_info,
             max_rustc_concurrency,
+            error_msg,
         )?;
         Ok(())
     }
@@ -698,6 +719,10 @@ h1 {
   text-align: center;
 }
 
+.error-text {
+  color: #e80000;
+}
+
 </style>
 </head>
 <body>

Original file line number	Diff line number	Diff line change
`@@ -676,6 +676,7 @@ impl<'a, 'cfg> DrainState<'a, 'cfg> {`
`676`	`676`	`}`
`677`	`677`
`678`	`678`	`let time_elapsed = util::elapsed(cx.bcx.config.creation_time().elapsed());`
	`679`	`+ self.timings.finished(cx.bcx, &error)?;`
`679`	`680`
`680`	`681`	`if let Some(e) = error {`
`681`	`682`	`Err(e)`
`@@ -687,7 +688,6 @@ impl<'a, 'cfg> DrainState<'a, 'cfg> {`
`687`	`688`	`if !cx.bcx.build_config.build_plan {`
`688`	`689`	`cx.bcx.config.shell().status("Finished", message)?;`
`689`	`690`	`}`
`690`		`- self.timings.finished(cx.bcx)?;`
`691`	`691`	`Ok(())`
`692`	`692`	`} else {`
`693`	`693`	`debug!("queue: {:#?}", self.queue);`